790 files changed, 52591 insertions, 3665 deletions

diff --git a/i18n/da/addressbook.ts b/i18n/da/addressbook.ts
index f35548c..c8f0078 100644
--- a/i18n/da/addressbook.ts
+++ b/i18n/da/addressbook.ts
@@ -1302,212 +1302,212 @@ Opie-Mail fås gratis!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kirgisistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palæstinensiske selvstyre områder</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Tryk for at indtaste efter-, mellem- og fornavn</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Indtast hele navnet direkte! Hvis du har et efternavn bestående af flere ord (f.eks. &quot;de la Guerra&quot;), så skriv &lt;efternavn&gt;, &lt;fornavne&gt; sådan: &quot;de la Guerra, Carlos Pedro&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Stillingsbetegnelse..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Noget i retning af &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Arbejdsstedet for kontakten</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Tryk for at vælge attributten du vil ændre</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Tryk for at vælge hvordan navnet skal gemmes (og hvordan det skal vises i liste visningen)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Arbejdstelefon</translation>
+        <translation type="obsolete">Arbejdstelefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Arbejdsfax</translation>
+        <translation type="obsolete">Arbejdsfax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Arbejdsmobil</translation>
+        <translation type="obsolete">Arbejdsmobil</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Standard email</translation>
+        <translation type="obsolete">Standard email</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Emails</translation>
+        <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Hjemmetelefon</translation>
+        <translation type="obsolete">Hjemmetelefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Hjemmefax</translation>
+        <translation type="obsolete">Hjemmefax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Hjemmemobil</translation>
+        <translation type="obsolete">Hjemmemobil</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Kontor</translation>
+        <translation type="obsolete">Kontor</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profession</translation>
+        <translation type="obsolete">Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistent</translation>
+        <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Bestyrer</translation>
+        <translation type="obsolete">Bestyrer</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Ægtefælle</translation>
+        <translation type="obsolete">Ægtefælle</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Køn</translation>
+        <translation type="obsolete">Køn</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Fødselsdag</translation>
+        <translation type="obsolete">Fødselsdag</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Årsdag</translation>
+        <translation type="obsolete">Årsdag</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Øgenavn</translation>
+        <translation type="obsolete">Øgenavn</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Børn</translation>
+        <translation type="obsolete">Børn</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Navn titel</translation>
+        <translation type="obsolete">Navn titel</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Fornavn</translation>
+        <translation type="obsolete">Fornavn</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Mellemnavn</translation>
+        <translation type="obsolete">Mellemnavn</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Efternavn</translation>
+        <translation type="obsolete">Efternavn</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Suffiks</translation>
+        <translation type="obsolete">Suffiks</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Gem som</translation>
+        <translation type="obsolete">Gem som</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Job titel</translation>
+        <translation type="obsolete">Job titel</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Afdeling</translation>
+        <translation type="obsolete">Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Firma</translation>
+        <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Arbejds adresse</translation>
+        <translation type="obsolete">Arbejds adresse</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Arbejds by</translation>
+        <translation type="obsolete">Arbejds by</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Arbejds stat</translation>
+        <translation type="obsolete">Arbejds stat</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Arbejds postnummer</translation>
+        <translation type="obsolete">Arbejds postnummer</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Arbejds land</translation>
+        <translation type="obsolete">Arbejds land</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Arbejds personsøger</translation>
+        <translation type="obsolete">Arbejds personsøger</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Arbejds hjemmeside</translation>
+        <translation type="obsolete">Arbejds hjemmeside</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Hjemmeadresse</translation>
+        <translation type="obsolete">Hjemmeadresse</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Hjemmeby</translation>
+        <translation type="obsolete">Hjemmeby</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Hjemmestat</translation>
+        <translation type="obsolete">Hjemmestat</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Hjemmepostnummer</translation>
+        <translation type="obsolete">Hjemmepostnummer</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Hjemmeland</translation>
+        <translation type="obsolete">Hjemmeland</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Hjemme website</translation>
+        <translation type="obsolete">Hjemme website</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Noter</translation>
+        <translation type="obsolete">Noter</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index 58b72d8..c56b41d 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -248,96 +248,103 @@ og er licenseret som GPL</translation>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>Kan ikke fjerne den aktuelle mappe
 fra bogmærker.
 Den er ikke bogmærket!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Filsøgning</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>Vil du slette %1
 og alt hvad der er i den?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>Vil du slette
 %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished">Filstyring :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished">kB ledig</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Kopier &apos;%1&apos; som</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Gem output i filen (kun navn)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Processen kunne ikke starte</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Fejl
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Afsluttet
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Indstil fil-rettighederne</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Indstil fil-rettighederne for:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>ejer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppe</translation>
     </message>
diff --git a/i18n/da/appearance.ts b/i18n/da/appearance.ts
index 678507d..6ff01a8 100644
--- a/i18n/da/appearance.ts
+++ b/i18n/da/appearance.ts
@@ -38,109 +38,109 @@
         <translation>Fane stil:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Faner</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Faner m. ikoner</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Drop-down liste</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Drop-down liste m. ikoner</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Top</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bund</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Skrifttype</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farver</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vinduer</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Genstart</translation>
+        <translation type="obsolete">Genstart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Vil du genstarte %1 nu?</translation>
+        <translation type="obsolete">Vil du genstarte %1 nu?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="obsolete">Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nej</translation>
+        <translation type="obsolete">Nej</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Gem skema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Gem skema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Skemaet eksisterer allerede.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Slet skema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kan ikke slette nuværende skema.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;ny&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Stil-arter styrer den måde elementer så som knapper og rullebjælker vises i alle programmer.
 
 Klik her for at vælge en tilgængelig stilart.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klik her for at konfigurere den nuværende valgte stil-art.
 
 Note: Denne mulighed er ikke tilgængelig ved alle stil-arter.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Vindues udsmykninger styrer måden som program titelbjælken og dens knapper vises.
 
 Klik her for at vælge en tilgængelig udsmykning.</translation>
diff --git a/i18n/da/calculator.ts b/i18n/da/calculator.ts
index 12975be..109e267 100644
--- a/i18n/da/calculator.ts
+++ b/i18n/da/calculator.ts
@@ -85,97 +85,97 @@
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Calculator</source>
-        <translation>Lommeregner</translation>
+        <translation type="obsolete">Lommeregner</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/da/checkbook.ts b/i18n/da/checkbook.ts
index c105c18..bf3558e 100644
--- a/i18n/da/checkbook.ts
+++ b/i18n/da/checkbook.ts
@@ -2,523 +2,753 @@
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nyt checkhæfte</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transaktioner</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Diagrammer</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beskyttet med kodeord</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik her for at slå beskyttelse med kodeord til eller fra.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Skriv navnet på checkhæftet her.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Vælg checkhæfte-typen her.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Opsparinger</translation>
+        <translation type="obsolete">Opsparinger</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Regninger</translation>
+        <translation type="obsolete">Regninger</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Pengemarkedet</translation>
+        <translation type="obsolete">Pengemarkedet</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Fælleskapital</translation>
+        <translation type="obsolete">Fælleskapital</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Andet</translation>
+        <translation type="obsolete">Andet</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Skriv checkhæftets banks navn her.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Kontonummer:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Skriv kontonummer for checkhæftet her.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN kode:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Skriv checkhæftets pinkode her.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Skriv checkhæftets startsaldo her.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Skriv yderligere informationer for checkhæftet her.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Nuværende saldo: %10.00</translation>
+        <translation type="obsolete">Nuværende saldo: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Her vises checkhæftets nuværende saldo.</translation>
+        <translation type="obsolete">Her vises checkhæftets nuværende saldo.</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>Dette er en liste med alle checkhæftets transaktioner.
 
 For at sortere efter en kolonne, klik på kolonnens navn.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Beløb</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik her for at tilføje en ny transaktion.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Vælg en transaktion, og klik her for at redigere den.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Vælg et checkhæfte og klik her for at slette det.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Vælg det ønskede diagram herunder, og klik på Tegn-knappen.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik her for at vælge diagram-typen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kontoens saldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Udtrækninger efter kategori</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Indsættelser efter kategori</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Tegn</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik her for at tegne det valgte diagram.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Nuværende saldo: %1%2</translation>
+        <translation type="obsolete">Nuværende saldo: %1%2</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Skriv venligst dit kodeord:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bekræft kodeord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bekræft dit kodeord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Skriv dit kodeord for at bekræfte, at du vil slå kodeordsbeskyttelse fra:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Slet transaktion</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Saldo</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigurer Checkhæfte</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Skriv valutasymbol:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Skriv symbolet for den lokale valuta her (fx. kr).</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Vis om checkhæftet er beskyttet med
 kodeord</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>Klik her for at vælge, om hovedvinduet skal vise, om checkhæftet er beskyttet med kodeord.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Vis checkhæfte-saldi</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik her for at vælge om hoved-vinduet skal vise den nuværende saldo for hver checkhæfte.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Slet</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Checkhæfte</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik her for at oprette et nyt checkhæfte.
 
 Du kan også vælge Nyt fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</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>Vælg et checkhæfte, og klik her for at redigere det.
 
 Du kan også vælge Rediger fra Checkhæfte-menuen, eller klikke og holde nede på et checkhæftes navn.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Vælg et checkhæfte, og klik her for at slette det.
 
 Du kan også vælge Slet fra Checkhæfte-menuen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik er for at konfigurere dette program.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dette er en liste over tilgængelige checkhæfter.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Checkhæfte-navn</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Skriv kodeord</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Skriv dit kodeord:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Slet checkhæfte</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Dato</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Rediger</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Ny</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Slet</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Opsparinger</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Regninger</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Pengemarkedet</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Fælleskapital</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Andet</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Bil</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Regninger</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CD&apos;er</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Tøj</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Computer</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVD&apos;er</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Elektronik</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Underholdning</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Mad</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Benzin</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Diverse</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Film</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Leje</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Rejser</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Arbejde</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Familiemedlem</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Diverse kredit</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaktion for</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Udtrækning</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Vælg om transaktionen er et udtræk eller en indsættelse.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Indsættelse</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Dato:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Vælg transaktionens dato her.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummber:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Skriv check-nummer her.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Skriv en beskrivelse af transaktionen her.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Vælg en transaktions-kategori her.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Vælg transaktionstypen her.
 
 De tilgængelige valgmuligheder er ud fra om det er en indsætning eller en udtrækning.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Beløb:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Skriv beløbet her.
 
 Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Gebyr:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Skriv eventuelt gebyr for transaktionen.
 
 Beløbet skal altid være positivt.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notater:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Skriv evt. ekstra informationer om transaktionen her.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Bil</translation>
+        <translation type="obsolete">Bil</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Regninger</translation>
+        <translation type="obsolete">Regninger</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CD&apos;er</translation>
+        <translation type="obsolete">CD&apos;er</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Tøj</translation>
+        <translation type="obsolete">Tøj</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Computer</translation>
+        <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVD&apos;er</translation>
+        <translation type="obsolete">DVD&apos;er</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electronics</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Underholdning</translation>
+        <translation type="obsolete">Underholdning</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Mad</translation>
+        <translation type="obsolete">Mad</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Benzin</translation>
+        <translation type="obsolete">Benzin</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Diverse</translation>
+        <translation type="obsolete">Diverse</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Film</translation>
+        <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Leje</translation>
+        <translation type="obsolete">Leje</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Rejser</translation>
+        <translation type="obsolete">Rejser</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Udskrevet check</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Overførsel</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditkort</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Arbejde</translation>
+        <translation type="obsolete">Arbejde</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Familiemedlem</translation>
+        <translation type="obsolete">Familiemedlem</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Diverse kredit</translation>
+        <translation type="obsolete">Diverse kredit</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Automatisk betaling</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Kontant</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Elektronik</translation>
+        <translation type="obsolete">Elektronik</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index 5469bbc..643e586 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -106,96 +106,100 @@ Afslut alligevel?</translation>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>O</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>L</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Mandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Tirsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Onsdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Torsdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Fredag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Lørdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Søndag</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished">Tid</translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -325,97 +329,97 @@ Afslut alligevel?</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standardindstillinger</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Sted:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Denne begivenhed varer hele dagen.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">MTOTFLSM</translation>
+        <translation type="unfinished">MTOTFLSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>u</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>U: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Start tid</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Slut tid</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Gentag...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Dagligt...</translation>
@@ -444,137 +448,137 @@ Afslut alligevel?</translation>
         <translation>Ny begivenhed</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokation</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategori</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Møde</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Frokost</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Middag</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Rejse</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Beskrivelse</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Slut</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Start tid</translation>
+        <translation type="unfinished">Start tid</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tidszone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutter</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Lydløs</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Gentag</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ingen gentagelse...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Bemærkning...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Start tid</translation>
+        <translation type="obsolete">Start tid</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Rediger bemærkning</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Frokost</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Slut</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 hver </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>D. %1 hver </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>D. %1 %1 hver</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/da/doctab.ts b/i18n/da/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/da/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/filebrowser.ts b/i18n/da/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/da/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/gsmtool.ts b/i18n/da/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/da/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/kate.ts b/i18n/da/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/da/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/kpacman.ts b/i18n/da/kpacman.ts
index 1004156..0c677a7 100644
--- a/i18n/da/kpacman.ts
+++ b/i18n/da/kpacman.ts
@@ -160,64 +160,68 @@ or is of an unknown format.</source>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1. SPILLER</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2. SPILLER</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>TILLYKKE</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>DU HAR OPNÅET</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>EN PLADS I TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation type="unfinished">@DD@/@MM@ &apos;@YY@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/launchersettings.ts b/i18n/da/launchersettings.ts
index 0060372..2af1b17 100644
--- a/i18n/da/launchersettings.ts
+++ b/i18n/da/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished">Launcher indstillinger</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
@@ -105,104 +159,104 @@
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libfreetypefactory.ts b/i18n/da/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libmemoryapplet.ts b/i18n/da/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/da/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libmpeg3plugin.ts b/i18n/da/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/liboapp.ts b/i18n/da/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libopie.ts b/i18n/da/libopie.ts
index a4c78e1..5476eec 100644
--- a/i18n/da/libopie.ts
+++ b/i18n/da/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Post-knap</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Home-knap</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Optag-knap</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Roter skærmbillede</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rød:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Grøn:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Blå:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Vælg farve</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Mere</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Mere...</translation>
+        <translation type="obsolete">Mere...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Åbn</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Navn:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størelse</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Stor</translation>
@@ -364,102 +376,106 @@ og</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>uge(r)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Gentag efter</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Hver</translation>
     </message>
     <message>
         <source>on </source>
         <translation>på</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tid:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Vælg tid:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">Beskrivelse:</translation>
+        <translation type="unfinished">Beskrivelse:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Deadline:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standard email:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Kontor:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Arbejde hjemmeside:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Arbejde tlf:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Arbejde fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Arbejde mobil-tlf:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Forretning pager:</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Privat hjemmeside:</translation>
@@ -585,79 +601,259 @@ og</translation>
         <translation>Søndag</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenter</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Filer</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Alle filer</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Meget høj</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Høj</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Meget lav</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Placering:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Hele dagen</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Flere dage</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbejds-adresse:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbejds-adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Hjemme-adresse:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Hjemme-adresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Den %1 %2 på hver</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>.</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>.</translation>
     </message>
     <message>
         <source>th</source>
         <translation>.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libopiecore2.ts b/i18n/da/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/da/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libopiedb2.ts b/i18n/da/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libopiemm2.ts b/i18n/da/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libopiepim2.ts b/i18n/da/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libopieui2.ts b/i18n/da/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libqdasher.ts b/i18n/da/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/da/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 564d08f..4bde867 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -820,109 +820,97 @@ Frigør noget hukommelse og prøv igen.</translation>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Maj</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fejl</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Fejl</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kort</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Harddisk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD Kort</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC Kort</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Harddisk</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Intern Hukommelse</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Internt Lager</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/da/librestartapplet.ts b/i18n/da/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/libtinykate.ts b/i18n/da/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/da/libtinykate.ts
+++ b/i18n/da/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/da/libtodayaddressbookplugin.ts b/i18n/da/libtodayaddressbookplugin.ts
index 6cf760a..7ac6bea 100644
--- a/i18n/da/libtodayaddressbookplugin.ts
+++ b/i18n/da/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Kontakter plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Fødselsdage de næste &lt;b&gt; %1 &lt;/b&gt; dage:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Ingen fødselsdage de næste &lt;b&gt; %1 &lt;/b&gt; dage!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Bryllupsdage de næste &lt;b&gt; %1 &lt;/b&gt; dage:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Ingen bryllupsdage de næsten &lt;b&gt; %1 &lt;/b&gt; dage!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/libvtapplet.ts b/i18n/da/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/da/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/light-and-power.ts b/i18n/da/light-and-power.ts
index 57239d0..3579eeb 100644
--- a/i18n/da/light-and-power.ts
+++ b/i18n/da/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 trin</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation>Lys og Strøm Indstillinger</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>På Batteri</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Generelle Indstillinger</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sek</translation>
     </message>
     <message>
         <source>never</source>
         <translation>aldrig</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Sluk lyset efter</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Dæmp lyset efter</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Dvale efter</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Deaktiver kun LCD (går ikke i dvale)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Baggrundsbelysning</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
         <translation>Indstil lysstyrken på baggrundsbelysningen</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Slukket</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Ved at måle det omgivende lys der hvor du bruger din enhed, kan skærmbelysningen automatisk blive justeret. Indstillingen for lysstyrken påvirker stadig den gennemsnitlige lysstyrke.</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Kalibrér</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Advancerede indstillinger for brug af lyssensor</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>På AC</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Advarsler</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Lavt batteri advarselsinterval</translation>
     </message>
     <message>
         <source> %</source>
         <translation> %</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>Ved hvilket batteriniveau bør &quot;lavt batteri&quot; advarslen vises</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>Hvor ofte bør der undersøges for lavt batteriniveau. Dette bestemmer den rate advarsler vises i, ved situationer med lavt batteri</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>Ved hvilket batteriniveau bør &quot;kritisk lavt batteri&quot; advarslen vises</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>Lavt batteri advarsel ved</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>Kritisk lavt batteri advarsel ved</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Sensor Kalibrering</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Fuld</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Slukket</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Mørk</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Lys</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Trin</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Kontrol interval</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sek</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/mobilemsg.ts b/i18n/da/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/da/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/oipkg.ts b/i18n/da/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/da/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/op-qws.ts b/i18n/da/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/da/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/opie-login.ts b/i18n/da/opie-login.ts
index 01d0b25..1aeda80 100644
--- a/i18n/da/opie-login.ts
+++ b/i18n/da/opie-login.ts
@@ -5,80 +5,80 @@
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Tryk præcist og bestemt på krydsene
 for at kalibrere skærmen.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Velkommen til Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Velkommen til OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Bruger</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Kodeord</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Stands</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Genstart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Forkert kodeord</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Kodeordet er forkert.</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Kunne ikke starte Opie.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/opierec.ts b/i18n/da/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/da/opierec.ts
+++ b/i18n/da/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/ordesktop.ts b/i18n/da/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/osearch.ts b/i18n/da/osearch.ts
index f694747..9fa3d76 100644
--- a/i18n/da/osearch.ts
+++ b/i18n/da/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation>Søg i alle</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Versalfølsom</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Brug jokertegn</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Detaljer om søgeresultatet</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Valg</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Skriv dine søgeord her</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programmer</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenter</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Opgaveliste</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultater</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>vis</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>rediger</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>kør</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>åbn i filhåndtering</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>åbn med</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>vis udførte opgaver</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>vis hændelser i fortiden</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>søg i datoer</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fil:</translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index c039711..f8cc1ea 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Program Problem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -194,96 +198,100 @@ Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Intet program</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Der er ikke defineret noget program til dette dokument.&lt;p&gt;Typen er %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Finder dokumenter</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Søger dokumenter</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumenter</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikoner</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 filer</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Alle typer filer</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Dokument visning</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medie indsat</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Lyd</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Billede</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
@@ -310,181 +318,201 @@ Genoplad venligst back-up batteriet.</translation>
         <translation type="obsolete">Dit valg vil blive gemt på mediet.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Spørg ikke igen for dette medie</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Batteristatus</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">Batteri niveauet er kritisk!
+        <translation type="obsolete">Batteri niveauet er kritisk!
 Hold enheden slukket indtil den får strøm igen!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">Back-up batteriet er næsten tomt.
+        <translation type="obsolete">Back-up batteriet er næsten tomt.
 Genoplad venligst back-up batteriet.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">visitkort</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Luk Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Genstart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Genstart Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Luk ned</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Disse muligheder er primært givet til brug under udvikling og test af Opie systemet. I et normalt miljø er dette unødvendigt.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Fortryd</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Luk ned...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Synkroniserings-forbindelse</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
+        <translation type="obsolete">&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Afvis</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Tillad</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Synkroniserer</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kontakter&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Fortryd</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/quicklauncher.ts b/i18n/da/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/reader.ts b/i18n/da/reader.ts
index c3b2da8..9d53cad 100644
--- a/i18n/da/reader.ts
+++ b/i18n/da/reader.ts
@@ -270,97 +270,97 @@ Actions</source>
     <message>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CLayoutPrefs2</name>
     <message>
         <source>Indent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page
 Overlap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Graphics
 Zoom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Margin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Paragraph
 Leading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Line
 Leading</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Markup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CMarkBarPrefs</name>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bogmærke</translation>
     </message>
     <message>
         <source>Annotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto</source>
         <translation type="unfinished">Gå til</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Autogen</source>
         <translation type="unfinished">Autogenerer</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation type="unfinished">Slet</translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished">Gem</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CMiscBarPrefs</name>
     <message>
         <source>Floating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Single bar</source>
         <translation type="unfinished"></translation>
     </message>
@@ -395,105 +395,105 @@ Leading</source>
     <message>
         <source>Movable</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CMiscPrefs</name>
     <message>
         <source>Annotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dictionary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Depluck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dejpluck</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Continuous</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plucker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CNavBarPrefs</name>
     <message>
         <source>Scroll</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Back</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tilbage</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hjem</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Frem</translation>
     </message>
     <message>
         <source>Page Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jump</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Page/Line Scroll</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CPrefs</name>
     <message>
         <source>OpieReader Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Layout(2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Locale</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
@@ -631,155 +631,155 @@ Leading</source>
         <translation>Autogenerer</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
         <source>Tidy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy Block</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
         <source>Marks</source>
         <translation>Markeringer</translation>
     </message>
     <message>
         <source>Find Next</source>
         <translation>Find næste</translation>
     </message>
     <message>
         <source>Close Find</source>
         <translation>Luk søgning</translation>
     </message>
     <message>
         <source>Do Reg</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Visning</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbars</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Run Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export Links</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Goto End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Back</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tilbage</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hjem</translation>
     </message>
     <message>
         <source>Forward</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Frem</translation>
     </message>
     <message>
         <source>Scrolling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Target</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pause Paras</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Encoding</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ideogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmark</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Bogmærke</translation>
     </message>
     <message>
         <source>Reader</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>fileBrowser</name>
     <message>
         <source>Browse for file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation></translation>
     </message>
     <message>
         <source>Hidden</source>
         <translation>Skjulte</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index 8976158..2fca576 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -1,118 +1,243 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Vælg kode</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Indtast kode</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koden er forkert</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Den indtastede kode er forkert.
 Adgang nægtet</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Vilkårlig</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Indtast ny kode</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Gentag ny kode</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sikkerheds Indstillinger</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Skift kode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Slet kode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Spørg efter kode ved opstart</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synkronisering</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Tillad synkronisering fra netværk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (standard)</translation>
+        <translation type="obsolete">192.168.129.0/24 (standard)</translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
-        <translation></translation>
+        <source>Any</source>
+        <translation type="obsolete">Vilkårlig</translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
-        <translation></translation>
+        <source>None</source>
+        <translation type="obsolete">Ingen</translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
-        <translation></translation>
+        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <translation>&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
-        <translation></translation>
+        <source>Passcode</source>
+        <translation>Kodeord</translation>
     </message>
     <message>
-        <source>Any</source>
-        <translation>Vilkårlig</translation>
+        <source>Login</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
-        <translation>Ingen</translation>
+        <source>Login Automatically</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation>&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
-        <translation></translation>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
-        <translation>Kodeord</translation>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/showimg.ts b/i18n/da/showimg.ts
index f642aa8..9168fe9 100644
--- a/i18n/da/showimg.ts
+++ b/i18n/da/showimg.ts
@@ -103,86 +103,83 @@
         <source> - Image Viewer</source>
         <translation> - Billedviser</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 farver</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Ægte farver</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha niveau</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha kanal</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Lysbilledshow</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Pause mellem billeder</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Gentag lysbilledshow</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Vis billeder baglæns</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Hent billeder roteret 90 grader</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Hent billeder hurtigt</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/sound.ts b/i18n/da/sound.ts
index 3096d86..767b5d0 100644
--- a/i18n/da/sound.ts
+++ b/i18n/da/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>Key_Calender</source>
         <translation>Key_Calender</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Key_Contacts</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Key_Menu</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Key_Mail</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Optagelses grænse i sekunder:</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Uendelig</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Genstart Opie hvis nødvendigt</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/sysinfo.ts b/i18n/da/sysinfo.ts
index 6aa99d4..9fe6d07 100644
--- a/i18n/da/sysinfo.ts
+++ b/i18n/da/sysinfo.ts
@@ -30,124 +30,138 @@
         <translation type="unfinished">SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished">In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den indbyggede hukommelse (f.eks. Flash hukommelsen) på denne håndholdte enhed.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished">RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished">Denne graf repræsenterer hvor meget hukommelse der iøjeblikket er i brug af den midlertidige RAM disk.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Program CPU forbrug (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>System CPU forbrug (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Denne side viser hvor meget af denne enheds processor er i brug.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Denne side viser hvor meget hukommelse (f.eks. RAM) der bliver allokeret på din håndholdte enhed.
+        <translation type="obsolete">Denne side viser hvor meget hukommelse (f.eks. RAM) der bliver allokeret på din håndholdte enhed.
 Hukommelse er kategoriseret som følgende:
 
 1. Brugt - hukommelse brugt af Opie og alle igangværende programmer.
 2. Buffer - midlertidigt lager brugt til at øge ydelsen.
 3. Cache - information der fornyelig har været brugt men ikke er blevet frigjort endnu.
 4. Fri - hukommelsen der iøjeblikket ikke er i brug af Opie eller andre igangværende programmer.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Brugt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffere (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Fri (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Hukommelse ialt: %1 kB</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Størrelse</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Brug#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Brugt af</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dette er en liste af alle de kernel moduler der iøjeblikket er indlæst på denne håndholdte enhed.
 
 Klik og hold på et modul for at se yderligere information om modulet eller for at fjerne det.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Vælg en kommando her og klik på Send knappen til højre for at sende kommandoen til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik her for at sende den valgte kommando til det valgte modul oven over.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dette område viser detaljeret information om dette modul.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Vil du virkelig køre
 </translation>
@@ -180,119 +194,128 @@ Klik og hold på et modul for at se yderligere information om modulet eller for
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Kommando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dette er en liste over alle processer på denne håndholdte enhed.
 
 Klik og hold på en proces for at se yderligere information om processen eller for at sende et signal til den.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Vælg et signal her og klik på Send-knappen til højre for at sende til denne proces.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Send</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik her for at sende det valgte signal til denne proces.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dette område viser detaljeret information omkring denne proces.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Vil du sende
 </translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>System Info</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Hukommelse</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Lager</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduler</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kerne&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompileret af: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Bygget den: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Model: </translation>
+        <translation type="obsolete">&lt;p&gt;Model: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Producent: </translation>
+        <translation type="obsolete">&lt;p&gt;Producent: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Denne side viser de nuværende versioner af Opie, Linux kernen og distributionen der kører på denne håndholdte enhed.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/da/taboapp.ts b/i18n/da/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/da/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/da/tictac.ts b/i18n/da/tictac.ts
index 2a42304..509682c 100644
--- a/i18n/da/tictac.ts
+++ b/i18n/da/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>Kryds og bolle</translation>
+        <translation type="obsolete">Kryds og bolle</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computeren starter</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Spilleren starter</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Spil!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Klik &apos;Spil&apos; for at starte</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Dit træk</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Du vandt!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Computeren vandt!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Uafgjort</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/today.ts b/i18n/da/today.ts
index 003d9b8..343335c 100644
--- a/i18n/da/today.ts
+++ b/i18n/da/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Idag</translation>
+        <translation type="obsolete">Idag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Ejes af </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Udfyld venligst visitkortet</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik her for at starte det tilknyttede program</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Ingen plugins fundet</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ingen plugins aktiveret</translation>
     </message>
     <message>
         <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Ejes af %1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Idag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Idag af Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik her for at gå til indstillingerne</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Hent hvilke plugins i hvilken rækkefølge:</translation>
     </message>
     <message>
diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index e81cb70..5fdb160 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -177,97 +177,97 @@ Quit Anyway?</source>
 gemme dine ændringer.
 Frigør noget lagerplads
 og prøv igen.
 
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Opgaveliste</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>Alle opgaver?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>Alle afsluttede opgaver?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</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;%1 nye opgaver er modtaget.&lt;p&gt;Vil du tilføje dem til din opgaveliste?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nye opgaver</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikere</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>A.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioritet</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Beskrivelse</translation>
+        <translation type="obsolete">Beskrivelse</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Deadline</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Konfigurer skabeloner</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritet:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Skabelon redigering</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Tilføj</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Navn</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Ny skabelon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at bestemme prioriteten på den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
@@ -295,96 +295,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at indtaste yderligere information til den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at tilføje en ny opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik her for at nulstille informationen i den nye opgave.
 
 Dette område kaldes genvejspanelet.
 
 Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette område kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis genvejspanel&apos; fra menuen foroven.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Data kan ikke redigeres, er ved at synkronisere</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Data kan ikke redigeres, er ved at synkronisere</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabel visning</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dag(e)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Rediger</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tid</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beskrivelse:</translation>
diff --git a/i18n/da/tonleiter.ts b/i18n/da/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/da/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/da/zsafe.ts b/i18n/da/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/da/zsafe.ts
+++ b/i18n/da/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index 1c6bba9..d3dda2c 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -1304,212 +1304,212 @@ wird nach dem Neustart der Anwendung aktiv!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Inseln</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Hier Klicken, um Vor-, Mittel- und Nachnamen einzugeben</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Geben Sie hier den vollen Namen direkt ein ! Wenn Ihr letzter Name aus mehreren Worten besteht (bspw. &quot;von der Vogelweide&quot;), schreiben Sie ihn bitte als &lt;Nachname&gt;,&lt;Vornamen&gt; wie bspw. &quot;von der Vogelweide, Walter Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Die Berufsbezeichnug..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Suffixe wie bspw. &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Die Arbeitsstelle des Kontakts</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Hier Klicken um ein Attribut zu ändern</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Hier auswählen, wie der Name gespeichert wird (und wie er in der Liste erscheint)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Tel. gesch.</translation>
+        <translation type="obsolete">Tel. gesch.</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax gesch.</translation>
+        <translation type="obsolete">Fax gesch.</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Handy gesch.</translation>
+        <translation type="obsolete">Handy gesch.</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Standard-EMail</translation>
+        <translation type="obsolete">Standard-EMail</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>E-Mails</translation>
+        <translation type="obsolete">E-Mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Priv. Telefon</translation>
+        <translation type="obsolete">Priv. Telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Priv. Fax</translation>
+        <translation type="obsolete">Priv. Fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Priv. Handy</translation>
+        <translation type="obsolete">Priv. Handy</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Büro</translation>
+        <translation type="obsolete">Büro</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Beruf</translation>
+        <translation type="obsolete">Beruf</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistent</translation>
+        <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Manager</translation>
+        <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Ehepartner</translation>
+        <translation type="obsolete">Ehepartner</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Geschlecht</translation>
+        <translation type="obsolete">Geschlecht</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Geburtstag</translation>
+        <translation type="obsolete">Geburtstag</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Jahrestag</translation>
+        <translation type="obsolete">Jahrestag</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Spitzname</translation>
+        <translation type="obsolete">Spitzname</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Kinder</translation>
+        <translation type="obsolete">Kinder</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titel</translation>
+        <translation type="obsolete">Titel</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Vorname</translation>
+        <translation type="obsolete">Vorname</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Mittlerer Name</translation>
+        <translation type="obsolete">Mittlerer Name</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Nachname</translation>
+        <translation type="obsolete">Nachname</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Suffix</translation>
+        <translation type="obsolete">Suffix</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Speichern unter</translation>
+        <translation type="obsolete">Speichern unter</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Berufsbezeichnung</translation>
+        <translation type="obsolete">Berufsbezeichnung</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Abteilung</translation>
+        <translation type="obsolete">Abteilung</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Firma</translation>
+        <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Straße, gesch.</translation>
+        <translation type="obsolete">Straße, gesch.</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Gesch. Stadt</translation>
+        <translation type="obsolete">Gesch. Stadt</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Gesch. Staat</translation>
+        <translation type="obsolete">Gesch. Staat</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Gesch. PLZ</translation>
+        <translation type="obsolete">Gesch. PLZ</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Gesch. Land</translation>
+        <translation type="obsolete">Gesch. Land</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Gesch. Pager</translation>
+        <translation type="obsolete">Gesch. Pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Gesch. Web</translation>
+        <translation type="obsolete">Gesch. Web</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Priv. Straße</translation>
+        <translation type="obsolete">Priv. Straße</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Priv. Stadt</translation>
+        <translation type="obsolete">Priv. Stadt</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Priv. Staat</translation>
+        <translation type="obsolete">Priv. Staat</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Priv. PLZ</translation>
+        <translation type="obsolete">Priv. PLZ</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Priv. Land</translation>
+        <translation type="obsolete">Priv. Land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Priv. Webseite</translation>
+        <translation type="obsolete">Priv. Webseite</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notizen</translation>
+        <translation type="obsolete">Notizen</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index 1d8a7ff..d80b9b1 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -241,96 +241,103 @@ unter der GPL</translation>
         <translation>Aktuelles Verzeichnis aus den Lesezeichen entfernen</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>Kann das aktuelle Verzeichnis
 von den Lesezeichen nicht entfernen,
 da es nicht in den Lesezeichen ist!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Dateisuche</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>%1 und alle Inhalte wirklich löschen?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>%1 wirklich löschen?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>AdvancedFm :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>kB frei</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Auf Ansicht 1 schalten</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Auf Ansicht 2 schalten</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Noch nicht implementiert</translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Ausgabe in Datei speichern (nur Name)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Ausgabe</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Prozess konnte nicht gestartet werden</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Fertig</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Berechtigungen setzen</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Berechtigungen setzen für:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Eigentümer</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>others</source>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index 64ba9f7..2008b5e 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -38,109 +38,109 @@
         <translation>Reiterstil:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Reiter mit Icons</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Aufklappliste</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Aufklappliste m. Symb. </translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Oben</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Unten</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Schrift</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Fenster</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Neustart</translation>
+        <translation type="obsolete">Neustart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Wollen Sie %1 nun neu starten?</translation>
+        <translation type="obsolete">Wollen Sie %1 nun neu starten?</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>Save Scheme</source>
         <translation>Schema speichern</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Schema speichern</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Schema exitiert bereits.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Schema löschen</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kann das aktuelle Schema nicht löschen.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;neu&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Stile kontrollieren die Art und Weise, wie Elemente, wie bspw. Buttons und Scrollbars,  in Anwendungen erscheinen.
 Klicken Sie hier, um einen verfübgbaren Stil auszuwählen.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Klicken Sie hier um den momentan verfügbaren Stil auszuwählen.
 &lt;b&gt;Hinweis&lt;/b&gt;: Diese Option ist nicht für alle Stile verfügbar.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Windowdekorationen kontrollieren die Art der Titelleiste und der entsprechenden Buttons
 Klicken Sie hier um eine verfügbare Dekoration auszuwählen.</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
diff --git a/i18n/de/calculator.ts b/i18n/de/calculator.ts
index 573dfeb..d72b652 100644
--- a/i18n/de/calculator.ts
+++ b/i18n/de/calculator.ts
@@ -81,97 +81,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Taschenrechner</translation>
+        <translation type="obsolete">Taschenrechner</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht
 </translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distanz</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Radial</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatur</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volumen</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karat</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 35f16b3..56a5759 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -106,96 +106,100 @@ Trozdem beenden?</translation>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>D</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mittwoch</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donnerstag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Freitag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samstag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Sonntag</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editieren</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Eintrag ist ganztägig.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -325,97 +329,97 @@ Trozdem beenden?</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Dieser Termin ist ganztägig.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00.Jan-00.Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">MDMDFSSM</translation>
+        <translation type="unfinished">MDMDFSSM</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>W</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>P</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Mo</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Di</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Do</translation>
     </message>
     <message>
         <source>Fr</source>
@@ -471,145 +475,145 @@ Trozdem beenden?</translation>
         <source>End Time</source>
         <translation>endet um</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Neues Ereignis</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Treffen</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Mittagessen</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Abendessen</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reise</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Büro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>zu Hause</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Startzeit</translation>
+        <translation type="unfinished">Startzeit</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganztägig</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zeitzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>Minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Still</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Laut</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Wiederholung</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Keine Wiederholung...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Bescheibung</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Ende</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notizen...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Startzeit</translation>
+        <translation type="obsolete">Startzeit</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Notiz bearbeiten</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Mittagessen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Beginn</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Ende</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Den %1. %2. in jedem </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Am %1. jeden </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Den %1. %1. jeden</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/de/doctab.ts b/i18n/de/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/de/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/filebrowser.ts b/i18n/de/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/de/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/gsmtool.ts b/i18n/de/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/de/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/kate.ts b/i18n/de/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/de/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/kpacman.ts b/i18n/de/kpacman.ts
index bcbae46..6ae327a 100644
--- a/i18n/de/kpacman.ts
+++ b/i18n/de/kpacman.ts
@@ -175,67 +175,71 @@ oder iist in einem unbekannten Format.</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORTIERUNG: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>CURSOR DRÜCKEN ZUM STARTEN</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>HIGH SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>GRATULATION</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>SIE HABEN EINEN</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>PLATZ IN DER TOP10 ERREICHT.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNG   PKTE     NAME    DATUM</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@DD@/@MM@/@YY@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Die Graphik konnte nicht aufgebaut werden.
 
 Die Datei &apos;@PIXMAPNAME@&apos; existiert nicht.
 oder ist in einem unbekannten Format.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Initializierungsfehler</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/launchersettings.ts b/i18n/de/launchersettings.ts
index 89b09e2..7f67c1f 100644
--- a/i18n/de/launchersettings.ts
+++ b/i18n/de/launchersettings.ts
@@ -1,87 +1,141 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Launchereinstellungen</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menü</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Reiter</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Lädt Applets im O-Menü:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Zeigt Launcher-Reiter im O-Menü</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Wählen Sie die Applets, die Sie im O-Menü angezeigt haben möchten.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Fügt die Inhalte der Launcher-Reiter als Menüs in das O-Menü ein.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Beispiel 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Beispiel 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Beispiel 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Reiter bearbeiten</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Hintergrund</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Symbole</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vorschau %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Dies ist eine grobe Vorschau wie der gewählte Reiter aussehen wird.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Benutzerdefinierte Schrift</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -107,103 +161,111 @@
         <source>Default</source>
         <translation>Voreinstellung</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Größe:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Farbe: </translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher-Reiter: </translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>Werkzeugleiste</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>LÖschen</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Großen &quot;Busy Indicator&quot; aktivieren</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Blinkenden &quot;Busy-Indicator&quot; aktivieren</translation>
+        <translation type="obsolete">Blinkenden &quot;Busy-Indicator&quot; aktivieren</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Wählen Sie den Reiter den Sie bearbeiten oder Löschen möchten.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Fügt einen neuen Reiter in den Launcher ein.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Öffnet einen neuen Dialog um den gewählten Reiter zu bearbeiten.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Löscht einen Reiter aus dem Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in Bildschirmmitte möchten anstatt der in der Taskbar.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in der Taskbar möchten.</translation>
+        <translation type="obsolete">Aktivieren Sie dieses wenn Sie eine große Tätigkeitsanzeige in der Taskbar möchten.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>All Reiter</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Noch nicht implementiert</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Applets in die Taskbar laden:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Wählen Sie die Applets, die Sie in der Taskbar angezeigt haben möchten.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libfreetypefactory.ts b/i18n/de/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libkeyview.ts b/i18n/de/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/de/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index dbf7f33..0e8b3b6 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Liquid Stil</translation>
+        <translation type="unfinished">Liquid Stil</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Kein Durchscheinen</translation>
+        <translation type="unfinished">Kein Durchscheinen</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>getüpfelte Hintergrundfarbe</translation>
+        <translation type="unfinished">getüpfelte Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>getüpfelte Buttonfarbe</translation>
+        <translation type="unfinished">getüpfelte Buttonfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Durchscheinend getüpfelt, Hintergrundfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Hintergrundfarbe</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Durchscheinend getüpfelt, Buttonfarbe</translation>
+        <translation type="unfinished">Durchscheinend getüpfelt, Buttonfarbe</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Benutzerdef. Durchscheinen</translation>
+        <translation type="unfinished">Benutzerdef. Durchscheinen</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menüfarbe</translation>
+        <translation type="unfinished">Menüfarbe</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Textfarbe</translation>
+        <translation type="unfinished">Textfarbe</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Transparenz</translation>
+        <translation type="unfinished">Transparenz</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Schattierten Menütext verwenden</translation>
+        <translation type="unfinished">Schattierten Menütext verwenden</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Flache Werkzeugleistenbuttons</translation>
+        <translation type="unfinished">Flache Werkzeugleistenbuttons</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>getüpfelter Kontrast</translation>
+        <translation type="unfinished">getüpfelter Kontrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Hoch perfomanter Liquid-Stil von Mosfet</translation>
+        <translation type="unfinished">Hoch perfomanter Liquid-Stil von Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmemoryapplet.ts b/i18n/de/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/de/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libmpeg3plugin.ts b/i18n/de/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/liboapp.ts b/i18n/de/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libopie.ts b/i18n/de/libopie.ts
index e96a58d..dd54d3c 100644
--- a/i18n/de/libopie.ts
+++ b/i18n/de/libopie.ts
@@ -17,141 +17,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Mailknopf</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Heimatknopf</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Aufnahmeknopf</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Bildschirm Rotierung</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Tiefgestellt+Hoch</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Tiefgestellt+Runter</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Tiefgestellt+Rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Tiefgestellt+Links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Hochgestellt +Hoch</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Hochgestellt +Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Hochgestellt +Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Hochgestellt +Links</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Helligkeit:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sättigung:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Wert:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rot:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Grün:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Blau:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Alphakanal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Farbe wählen</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Mehr</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Mehr...</translation>
+        <translation type="obsolete">Mehr...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Dateidialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Dateityp</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Groß</translation>
@@ -365,102 +377,106 @@ und</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>Woche(n)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Wiederholen bis</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>on </source>
         <translation>an</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Zeit:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Zeit auswählen:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">Beschreibung:</translation>
+        <translation type="unfinished">Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fälligkeit:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Stand. EMail: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Büro: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Geschäftswebseiten: </translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Geschäftstelefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Geschäftshandy: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Geschäftspiepser: </translation>
@@ -598,79 +614,259 @@ und</translation>
         <translation>Notiz:</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>All Dateien</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Sehr hoch</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Sehr niedrig</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ort:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Das ist ein Termin ohne Zeit</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Das ist ein mehrtägiger Termin</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Privatadresse:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Privatadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Den %1 %2 jedes</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libopiecore2.ts b/i18n/de/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/de/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libopiedb2.ts b/i18n/de/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libopiemm2.ts b/i18n/de/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libopiepim2.ts b/i18n/de/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libopieui2.ts b/i18n/de/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libqdasher.ts b/i18n/de/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/de/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index 909f614..ed69bc9 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -822,109 +822,109 @@ frei und versuchen Sie es noch einmal
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mär</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="obsolete">Fehler</translation>
     </message>
     <message>
         <source>Could not find the application </source>
-        <translation>Konnte die Anwendung nicht finden</translation>
+        <translation type="obsolete">Konnte die Anwendung nicht finden</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>Could not start the application </source>
-        <translation>Konnte die Anwendung nicht starten</translation>
+        <translation type="obsolete">Konnte die Anwendung nicht starten</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 Dokument</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF-Karte</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Festplatte</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD-Karte</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI Festplatte</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>interner Speicher</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>interner Hauptspeicher</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC-Karte</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/de/librestartapplet.ts b/i18n/de/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/libtinykate.ts b/i18n/de/libtinykate.ts
index 44de66b..23b0f48 100644
--- a/i18n/de/libtinykate.ts
+++ b/i18n/de/libtinykate.ts
@@ -1,21 +1,974 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Kein Platz mehr verfügbar</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Das erstellen von KateConfiguration Informationen
 ist gescheitert. Bitte machen sie Speicher frei
 und probieren sie es noch ein Mal.</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/de/libtodayaddressbookplugin.ts b/i18n/de/libtodayaddressbookplugin.ts
index ce80b73..5137c11 100644
--- a/i18n/de/libtodayaddressbookplugin.ts
+++ b/i18n/de/libtodayaddressbookplugin.ts
@@ -1,95 +1,115 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Anzahl. Einträge: </translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Setzt die maximale Anzahl an Einträgen imgegeben Zeitraum</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Zeile abschneiden nach N Einträgen: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Nach wie vielen Zeichen soll Zeiel abgeschnitten werden</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Vorausschai in Tagen :</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Wieviele Tage soll vorau geschaut werden</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Einstellungen aktivieren: Anwendung neu starten !</translation>
+        <translation type="unfinished">Einstellungen aktivieren: Anwendung neu starten !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Überschriftenfarbe: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Farbe der Überschrift !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Einstragsfarbe: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Die Farbe des Eintrags selbs !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Setzt die Farbe für
 fällige Termine</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Tage: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Diese Farbe wird benutzt wenn der Termin kurz bevorsteht !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Diese Farbe wird benutzt wenn der Termin näher ist als der eingestellte Zeitraum !</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Addressbuch-Plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nächste Geburtstage in &lt;b&gt;%1&lt;/b&gt; Tagen: </translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Keine Geburtstage in  &lt;b&gt;%1&lt;/b&gt; Tagen!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nächste Jahrestage in &lt;b&gt;%1&lt;/b&gt; Tagen: </translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Keine Jahrestage in &lt;b&gt;%1&lt;/b&gt; Tagen !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Die Datenbank kann die Anfrage nicht durchführen. Vermutlich muss das libopie-Paket upgegradet werden ! &lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libvtapplet.ts b/i18n/de/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/de/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/light-and-power.ts b/i18n/de/light-and-power.ts
index 50e2f2a..ca81010 100644
--- a/i18n/de/light-and-power.ts
+++ b/i18n/de/light-and-power.ts
@@ -1,58 +1,65 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 Schritte</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Durch Messen des Umgebungslichts in Ihrer direkten Umgebung kann die Hintergrundbeleuchtung automatisch angepasst werden. Die Helligkeitseinstellung betrifft nach wie vor die mittlere Helligkeit.</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Licht aus nach</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Licht dimmen nach</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Ausschalten nach</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Helligkeitseinstellungen</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>Batteriebetrieb</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Allgemeine Einst.</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> Sek.</translation>
     </message>
     <message>
         <source>never</source>
         <translation>niemals</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Nur LCD ausschalten (kein Suspend)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Hintergrundbeleuchtung</translation>
@@ -68,85 +75,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation>Lichtsensor verwenden</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Kalibrieren</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Erweiterte Einstellungen für Lichtsensor</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>Netzbetrieb</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Warnungen</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Niedrigspannung Warnungsintervall</translation>
     </message>
     <message>
         <source> %</source>
         <translation> %</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>Batterielevel für Warnungshinweis</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>Wie oft soll die Spannung geprüft werden ? Definiert die Anzahl der Warnmeldungen</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>Batterielevel für Warnhinweis über kritischen Zustand</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>Sehr geringer Batterielevel</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>kritischer Batterielevel</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Sensorkalibrierung</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Voll</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Aus</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Dunkel</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Hell</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Schrittweite</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Prfintervall</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> Sek.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/mobilemsg.ts b/i18n/de/mobilemsg.ts
index a764ea7..e0f261c 100644
--- a/i18n/de/mobilemsg.ts
+++ b/i18n/de/mobilemsg.ts
@@ -1,73 +1,89 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MobileMsg</name>
     <message>
         <source>Messages: </source>
-        <translation>Nachrichten:</translation>
+        <translation type="obsolete">Nachrichten:</translation>
     </message>
 </context>
 <context>
     <name>MobileMsgBase</name>
     <message>
         <source>Mobile Messaging</source>
         <translation>Mobiler Nachrichtendienst</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer:</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Text</translation>
+        <translation type="obsolete">Text</translation>
     </message>
     <message>
         <source>Flash</source>
         <translation>Flash</translation>
     </message>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
         <source>SMS: %1</source>
-        <translation>SMS: %1</translation>
+        <translation type="obsolete">SMS: %1</translation>
     </message>
     <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
         <source>Country:</source>
-        <translation>Land:</translation>
+        <translation type="obsolete">Land:</translation>
     </message>
     <message>
         <source>Logo</source>
-        <translation>Logo</translation>
+        <translation type="obsolete">Logo</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation>Gruppe</translation>
+        <translation type="obsolete">Gruppe</translation>
     </message>
     <message>
         <source>Picture</source>
-        <translation>Bild</translation>
+        <translation type="obsolete">Bild</translation>
     </message>
     <message>
         <source>Message:</source>
-        <translation>Nachricht:</translation>
+        <translation type="obsolete">Nachricht:</translation>
     </message>
     <message>
         <source>EMS</source>
         <translation>EMS</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation>Tab</translation>
+        <translation type="obsolete">Tab</translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/networksettings.ts b/i18n/de/networksettings.ts
index 6c7b76d..8488f15 100644
--- a/i18n/de/networksettings.ts
+++ b/i18n/de/networksettings.ts
@@ -1,251 +1,251 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountWidget</name>
     <message>
         <source>IP</source>
-        <translation>IP</translation>
+        <translation type="obsolete">IP</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation>Gateway</translation>
+        <translation type="obsolete">Gateway</translation>
     </message>
 </context>
 <context>
     <name>AddConnection</name>
     <message>
         <source>Add Network Connection</source>
         <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Hinzu</translation>
     </message>
     <message>
         <source>Services</source>
         <translation>Dienste</translation>
     </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
+        <translation type="obsolete">&amp;Entfernen</translation>
     </message>
 </context>
 <context>
     <name>InterfaceAdvanced</name>
     <message>
         <source>Advanced Interface Information</source>
-        <translation>Erweiterte Informationen</translation>
+        <translation type="obsolete">Erweiterte Informationen</translation>
     </message>
     <message>
         <source>eth0</source>
-        <translation>eth0</translation>
+        <translation type="obsolete">eth0</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation>IP Adresse</translation>
+        <translation type="obsolete">IP Adresse</translation>
     </message>
     <message>
         <source>Interface</source>
-        <translation>Gerät</translation>
+        <translation type="obsolete">Gerät</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation>Netzmaske</translation>
+        <translation type="obsolete">Netzmaske</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation>0.0.0.0</translation>
+        <translation type="obsolete">0.0.0.0</translation>
     </message>
     <message>
         <source>DHCP Information</source>
-        <translation>DHCP Information</translation>
+        <translation type="obsolete">DHCP Information</translation>
     </message>
     <message>
         <source>DHCP Server</source>
-        <translation>DHCP Server</translation>
+        <translation type="obsolete">DHCP Server</translation>
     </message>
     <message>
         <source>Lease Expires</source>
-        <translation>Lease verfällt</translation>
+        <translation type="obsolete">Lease verfällt</translation>
     </message>
     <message>
         <source>Lease Obtained</source>
-        <translation>Lease erhalten</translation>
+        <translation type="obsolete">Lease erhalten</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation>Broadcast</translation>
+        <translation type="obsolete">Broadcast</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation>MAC Adresse</translation>
+        <translation type="obsolete">MAC Adresse</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation>00:00:00:00:00:00</translation>
+        <translation type="obsolete">00:00:00:00:00:00</translation>
     </message>
 </context>
 <context>
     <name>InterfaceInformation</name>
     <message>
         <source>Interface Information</source>
-        <translation>Geräte Information</translation>
+        <translation type="obsolete">Geräte Information</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation>IP Adresse</translation>
+        <translation type="obsolete">IP Adresse</translation>
     </message>
     <message>
         <source>0.0.0.0</source>
-        <translation>0.0.0.0</translation>
+        <translation type="obsolete">0.0.0.0</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation>Netzmaske</translation>
+        <translation type="obsolete">Netzmaske</translation>
     </message>
     <message>
         <source>00:00:00:00:00:00</source>
-        <translation>00:00:00:00:00:00</translation>
+        <translation type="obsolete">00:00:00:00:00:00</translation>
     </message>
     <message>
         <source>MAC Address</source>
-        <translation>MAC Adresse</translation>
+        <translation type="obsolete">MAC Adresse</translation>
     </message>
     <message>
         <source>Broadcast</source>
-        <translation>Broadcast</translation>
+        <translation type="obsolete">Broadcast</translation>
     </message>
     <message>
         <source>&amp;Refresh</source>
-        <translation>&amp;Erneuern</translation>
+        <translation type="obsolete">&amp;Erneuern</translation>
     </message>
     <message>
         <source>S&amp;top</source>
-        <translation>S&amp;top</translation>
+        <translation type="obsolete">S&amp;top</translation>
     </message>
     <message>
         <source>R&amp;estart</source>
-        <translation>N&amp;eustart</translation>
+        <translation type="obsolete">N&amp;eustart</translation>
     </message>
     <message>
         <source>&amp;Start</source>
-        <translation>&amp;Start</translation>
+        <translation type="obsolete">&amp;Start</translation>
     </message>
     <message>
         <source>&amp;View Advanced Information</source>
-        <translation>Erweiterte &amp;Informationen</translation>
+        <translation type="obsolete">Erweiterte &amp;Informationen</translation>
     </message>
     <message>
         <source>be &amp;silent</source>
-        <translation>Ruhig &amp;sein</translation>
+        <translation type="obsolete">Ruhig &amp;sein</translation>
     </message>
 </context>
 <context>
     <name>InterfacePPP</name>
     <message>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="obsolete">Fehler</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetup</name>
     <message>
         <source>Interface Configuration</source>
-        <translation>Geräte Konfiguration</translation>
+        <translation type="obsolete">Geräte Konfiguration</translation>
     </message>
     <message>
         <source>Automatically bring up</source>
-        <translation>Automatisch starten</translation>
+        <translation type="obsolete">Automatisch starten</translation>
     </message>
     <message>
         <source>DHCP</source>
-        <translation>DHCP</translation>
+        <translation type="obsolete">DHCP</translation>
     </message>
     <message>
         <source>Static Ip Configuration</source>
-        <translation>Statische IP</translation>
+        <translation type="obsolete">Statische IP</translation>
     </message>
     <message>
         <source>Subnet Mask</source>
-        <translation>Netzmaske</translation>
+        <translation type="obsolete">Netzmaske</translation>
     </message>
     <message>
         <source>255.255.255.0</source>
-        <translation>255.255.255.0</translation>
+        <translation type="obsolete">255.255.255.0</translation>
     </message>
     <message>
         <source>First DNS</source>
-        <translation>Erster DNS</translation>
+        <translation type="obsolete">Erster DNS</translation>
     </message>
     <message>
         <source>IP Address</source>
-        <translation>IP Adresse</translation>
+        <translation type="obsolete">IP Adresse</translation>
     </message>
     <message>
         <source>Gateway</source>
-        <translation>Gateway</translation>
+        <translation type="obsolete">Gateway</translation>
     </message>
     <message>
         <source>Second DNS</source>
-        <translation>Zweiter DNS</translation>
+        <translation type="obsolete">Zweiter DNS</translation>
     </message>
 </context>
 <context>
     <name>InterfaceSetupImp</name>
     <message>
         <source>Restarting interface</source>
-        <translation>Gerät neustarten</translation>
+        <translation type="obsolete">Gerät neustarten</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Network Settings</source>
         <translation>Netzwerkeinstellung</translation>
     </message>
     <message>
         <source>Connections</source>
         <translation>Verbindungen</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>t</source>
         <translation>t</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>in</source>
         <translation>in</translation>
     </message>
     <message>
         <source>IP</source>
         <translation>in</translation>
     </message>
     <message>
         <source>&amp;Add</source>
         <translation>&amp;Hinzu</translation>
     </message>
     <message>
         <source>&amp;Configure</source>
         <translation>&amp;Konfigurieren</translation>
     </message>
     <message>
         <source>&amp;Remove</source>
         <translation>&amp;Entfernen</translation>
     </message>
     <message>
         <source>Profiles</source>
         <translation>Profile</translation>
     </message>
@@ -272,198 +272,198 @@
     <message>
         <source>Add a new interface to the list.</source>
         <translation>Neue Schnittelstelle in die Liste.</translation>
     </message>
     <message>
         <source>&amp;Start/Stop</source>
         <translation>&amp;Start/Stop</translation>
     </message>
     <message>
         <source>Start and Stop the current interface, gives additional information about the interface.</source>
         <translation>Starten und Stoppen der aktuellen Schnittstelle, gibt auch Informationen über die Verbindung.</translation>
     </message>
     <message>
         <source>Configure the current interface</source>
         <translation>Aktuelle Schnittstelle konfigurieren</translation>
     </message>
     <message>
         <source>Remove the current interface from the list.</source>
         <translation>Aktuelle Schnittstelle aus der Liste entfernen.</translation>
     </message>
 </context>
 <context>
     <name>MainWindowImp</name>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Unable to remove.</source>
         <translation>Löchen nicht möglich.</translation>
     </message>
     <message>
         <source>Sorry</source>
         <translation>Bedaure </translation>
     </message>
     <message>
         <source>Please select an interface first.</source>
         <translation>Bitte wählen Sie zuerst eine Schnittstelle.</translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation>Getrennt</translation>
     </message>
 </context>
 <context>
     <name>ModemTransfer</name>
     <message>
         <source>Error</source>
-        <translation>Fehler</translation>
+        <translation type="obsolete">Fehler</translation>
     </message>
 </context>
 <context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation>WLAN Konfiguration</translation>
+        <translation type="obsolete">WLAN Konfiguration</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Generell</translation>
+        <translation type="obsolete">Generell</translation>
     </message>
     <message>
         <source>any</source>
-        <translation>Alle</translation>
+        <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation>SSID</translation>
+        <translation type="obsolete">SSID</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation>Infrastruktur</translation>
+        <translation type="obsolete">Infrastruktur</translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation>Managed</translation>
+        <translation type="obsolete">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
+        <translation type="obsolete">Ad-Hoc</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modus</translation>
+        <translation type="obsolete">Modus</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation>Acces Point fest &amp;einstellen</translation>
+        <translation type="obsolete">Acces Point fest &amp;einstellen</translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="obsolete">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation>&amp;Kanal fest einstellen</translation>
+        <translation type="obsolete">&amp;Kanal fest einstellen</translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation>Neu scannen</translation>
+        <translation type="obsolete">Neu scannen</translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation>Chn</translation>
+        <translation type="obsolete">Chn</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
+        <translation type="obsolete">Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>Verschlüsselung &amp;einschalten</translation>
+        <translation type="obsolete">Verschlüsselung &amp;einschalten</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Schlüssel</translation>
+        <translation type="obsolete">&amp;Schlüssel</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Schlüssel &amp;1</translation>
+        <translation type="obsolete">Schlüssel &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Schlüssel &amp;2</translation>
+        <translation type="obsolete">Schlüssel &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Schlüssel &amp;3</translation>
+        <translation type="obsolete">Schlüssel &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation>Schlüssel &amp;4</translation>
+        <translation type="obsolete">Schlüssel &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation>Unverschlüsselte Pakete</translation>
+        <translation type="obsolete">Unverschlüsselte Pakete</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation>&amp;Annehmen</translation>
+        <translation type="obsolete">&amp;Annehmen</translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation>&amp;Verwerfen</translation>
+        <translation type="obsolete">&amp;Verwerfen</translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation>Geräte Information</translation>
+        <translation type="obsolete">Geräte Information</translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation>802.11b</translation>
+        <translation type="obsolete">802.11b</translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation>Kanal</translation>
+        <translation type="obsolete">Kanal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation>Modus</translation>
+        <translation type="obsolete">Modus</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation>ESSID</translation>
+        <translation type="obsolete">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation>Station</translation>
+        <translation type="obsolete">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation>AP</translation>
+        <translation type="obsolete">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation>Durchsatz</translation>
+        <translation type="obsolete">Durchsatz</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation>Qualität</translation>
+        <translation type="obsolete">Qualität</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation>Rauschen</translation>
+        <translation type="obsolete">Rauschen</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation>Signal</translation>
+        <translation type="obsolete">Signal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/oipkg.ts b/i18n/de/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/de/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/op-qws.ts b/i18n/de/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/de/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/opie-login.ts b/i18n/de/opie-login.ts
index 6937c12..a4bcc0d 100644
--- a/i18n/de/opie-login.ts
+++ b/i18n/de/opie-login.ts
@@ -8,95 +8,99 @@ accurately to calibrate your screen.</source>
         <translation>Berühren Sie das Fadenkreuz kräftig
 und präzise um Ihr Display zu 
 kalibrieren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Willkommen zu OPIE</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Anmeldung</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Willkommen in Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Benutzer</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Ausschalten</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Falsches Passwort</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Das eingegebene Passwort ist nicht richtig.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">OPIE wurde durch
 ein nicht abgefangenes
 Signal beendet: %1
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fehlgeschlagen</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">OPIE konnte nicht gestartet werden.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Konnte nicht zu einer anderen Identität wechseln</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie wurde durch
 ein nicht abgefangenes
 Signal beendet: %1</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Opie konnte nicht gestartet werden.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/opierec.ts b/i18n/de/opierec.ts
index 5431db3..0ddf4d4 100644
--- a/i18n/de/opierec.ts
+++ b/i18n/de/opierec.ts
@@ -154,60 +154,68 @@ Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Konnte Tondatei nicht öffnen.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Apspielen</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Über IR senden</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Umbenennen</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>IR Übertragung</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR übertragen.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Aufn</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ort</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Wave Komprimierung (kleinere Dateien)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>auto still</translation>
+        <translation type="obsolete">auto still</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>still</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stopp</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/ordesktop.ts b/i18n/de/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/osearch.ts b/i18n/de/osearch.ts
index a1cdef8..337706c 100644
--- a/i18n/de/osearch.ts
+++ b/i18n/de/osearch.ts
@@ -33,96 +33,100 @@
     <message>
         <source>Search all</source>
         <translation>Überall suchen</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Groß-/Kleinschreibung beachten</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Benutze Wildcards</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Die Details der aktuellen Suche</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Gebe den zu suchenden Begriff hier ein</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Termine</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Adressbuch</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultate</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>Zeige</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>Ausführen</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>Im Dateimanager öffnen</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>Öffnen mit</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>Zeige auch erledigte Aufgaben</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>Zeige auch vergangene Termine</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>Suche in Zeitfeldern</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Datei:</translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 91a91f9..f0c5680 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -1,64 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Sprache</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Zeit und Datum</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Persönliche Informationen</translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Anwendungsproblem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 antwortet nicht.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Möchten Sie die Anwendung abbrechen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Schnellladen wurde für diese Anwendung ausgeschaltet. Tippen sie lange auf das Anwendungssymbol, um es wieder anzuschalten.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; wurde mit Signalcode %2 beendet&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Anwendung beendet</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Anwendung nicht gefunden</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte Anwendung &lt;b&gt;%1&lt;/b&gt; nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Konnte die Anwendung %1 nicht finden&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
@@ -111,218 +115,246 @@
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Starter</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Starter</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Keine Anwendung</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Es ist keine Anwendung für dieses Dokument des Typs %1 definiert&lt;/p&gt;.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumente</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Als Text betrachten</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Finde Dokumente...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Symbol-Ansicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Listenansicht</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation>Dokumentenansicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Alle Typen</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer Modus</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Qtopia neu starten</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Hilfe...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Systemdatum scheint nicht gültig zu sein.
 (%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Der Batteriestatus ist kritisch!
+        <translation type="obsolete">Der Batteriestatus ist kritisch!
 Schließen Sie das Gerät schnellst 
 möglich an die Stromversorgung an!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
-        <translation>Batterie nahezu erschöpft.</translation>
+        <translation type="obsolete">Batterie nahezu erschöpft.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>Die Ersatzbatterie ist schwach.
+        <translation type="obsolete">Die Ersatzbatterie ist schwach.
 Bitte laden Sie sie auf.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Visitenkarte</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer  Modus</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Es trat ein Fehler beim Systemstart ein, das System ist nun im sicheren Modus. Plugins wurden nicht geladen. Sie können die kritischen Plugins im Plugin Manager ausschalten.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Plugin Manager...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Speicher Status</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Knapper Speicher
 Bitte Daten sichern.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Kritische Speicherknappheit
 Bitte diese Anwendung 
 sofort beenden.</translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Opie beenden </translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Neustart</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Opie neu starten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Herunterfahren</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>Die Optionen zum Herunterfahren sind ausschließlich zur Entwicklung und für Tests des Opie-Systems gedacht. Unter normalen Bedingungen sind sie nicht notwendig.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Herunterfahren...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Synchronisationsverbindung</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Ein nicht authorisiertes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie eine Version von Qtopia Desktop verwenden die älter ist als 1.5.1 sollten Sie ein Upgrade in Betracht ziehen.</translation>
+        <translation type="obsolete">&lt;p&gt;Ein nicht authorisiertes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie eine Version von Qtopia Desktop verwenden die älter ist als 1.5.1 sollten Sie ein Upgrade in Betracht ziehen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Verweigern</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Ein nicht erkanntes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie gerade eben zum ersten Mal eine Synchronisation gestartet haben, ist diese Meldung normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Erlauben</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Abbruch</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronisiere:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/quicklauncher.ts b/i18n/de/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index 47318d6..df9e796 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -1,121 +1,266 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Passwort einstellen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Passwort eingeben</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Passwort falsch</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Das eingegebene Passwort ist falsch. Zugriff verwehrt</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Neues Passwort eingeben</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Passwort erneut eingeben</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Sicherheitseinstellungen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Passwort ändern</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Passwort löschen</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Passwort muss beim Starten 
 eingegeben werden</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Synchronisierung gestatten aus dem Netzwerk:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Alle</translation>
+        <translation type="obsolete">Alle</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Keine</translation>
+        <translation type="obsolete">Keine</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
 sollte jemand unerwünscht Zugriff auf dieses 
 Gerät erhalten.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (Standard)</translation>
+        <translation type="obsolete">192.168.129.0/24 (Standard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Passwort</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Automatisch einloggen</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/sound.ts b/i18n/de/sound.ts
index 351308f..d3e9ea6 100644
--- a/i18n/de/sound.ts
+++ b/i18n/de/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Aufnahmerate: </translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Aufnahmeverzeichnis: </translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Aufnahmetaste: </translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Max. Aufnahmezeit (s): </translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Unbegrenzt</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>OPIE bei Bedarf neu starten</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Key_Record</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index 9bc29d6..56b7014 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -51,103 +51,117 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU-Auslastung für Anwendungen (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Systemauslastung (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Diese Seite zeigt die Auslastung des Prozessors.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Gepufferter Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gecached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Freier Speicher (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Gesamter Speicher: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Diese Seite zeigt wieviel Speicher (z.B. RAM) auf dem Gerät momentan belegt ist.
+        <translation type="obsolete">Diese Seite zeigt wieviel Speicher (z.B. RAM) auf dem Gerät momentan belegt ist.
 Speicher wird wie folgt unterteilt:
 1. Belegt - Speicher, der von Opie und laufenden Anwendungen belegt wird.
 2. Puffer - Temporärer Speicher um die Performanz zu steigern
 3. Gecached - Information die seit kurzem nicht mehr benutzt wird, aber noch nicht freigegeben wurde.
 4. Frei - Speicher, der nicht durch Opie oder Anwendungen belegt wird. </translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Größe</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Benutzung#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Benutzt von</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dies ist ein eine Liste aller Kernelmodule, die zur Zeit in den Speicher geladen sind. Klicken Sie auf ei nModul und halten Sie den Stift dort, um erweiterte Informationen zu erhalten oder um das Modul zu entfernen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wählen Sie einen Befehl und klicken Sie auf &lt;b&gt;Senden&lt;/b&gt; um den Befehl auszuführen.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klicken Sie hier, um den Befehl an das Module zu senden.
 &lt;b&gt;Warnung:&lt;/b&gt; Das Senden von Befehlen an Module ist gefährlich und sollte nur durchgeführt werden, wenn Sie wisse, was Sie tun.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen der Module.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Möchten Sie den Befehl wirklich ausführen </translation>
     </message>
@@ -179,118 +193,131 @@ Click and hold on a module to see additional information about the module, or to
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Befehl</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dies ist eine Liste aller Prozesse dieses Gerätes.
 Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt zu bekommen oder um ein Signal dorthin zu senden.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Wählen Sie ein Signal aus und drücken Sie rechts &lt;b&gt;Senden&lt;/b&gt; um das Signal an den Prozess zu senden.
 &lt;b&gt;Achtung:&lt;/b&gt;Das Senden von Signalen sollte nur dann durchgeführt werden, wenn Sie wissen was Sie tun.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Senden</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klicken Sie hier, um das Signal an den Prozess zu senden.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dieser Bereich zeigt detaillierte Informationen über den gewählten Prozess an.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Wollen Sie das Signal wirklich senden </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>Sie wollen wirklich %1 an diesen Prozess schicken?</translation>
+        <translation type="obsolete">Sie wollen wirklich %1 an diesen Prozess schicken?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeminformationen</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Speicher</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Speichermedium</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Prozesse</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Module</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompiliert von:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Geschrieben am:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modell: </translation>
+        <translation type="obsolete">&lt;p&gt;Modell: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Hersteller:</translation>
+        <translation type="obsolete">&lt;p&gt;Hersteller:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Diese Seite zeigt die aktuelle Version von Opie, des Linux Kernels und der auf diesem Gerät verwendeten Distribution.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/de/taboapp.ts b/i18n/de/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/de/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/de/tictac.ts b/i18n/de/tictac.ts
index 2c6e430..cea344a 100644
--- a/i18n/de/tictac.ts
+++ b/i18n/de/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>TicTac</translation>
+        <translation type="obsolete">TicTac</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computer fängt an</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Spieler fängt an</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Los!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Auf &apos;Los!&apos; klicken, um zu starten</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Ziehen Sie</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Sie haben gewonnen!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Der Computer hat gewonnen!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Unentschieden</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 789360f..8ef4011 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Heute</translation>
+        <translation type="obsolete">Heute</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Dieses Gerät gehört </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Bitte füllen Sie Ihre Visitenkarte aus</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Keine Plugins gefunden</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Keine Plugins aktiviert</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Hier klicken, um das entsprechende 
 Programm zu starten</translation>
     </message>
     <message>
         <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Besitzer: %1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Heute</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Heute von Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klicken Sie hier, um den Konfigurations-
 dialog zu starten</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Reihenfolge des Plugin-Ladens:</translation>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index d54bdaf..54f3783 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -181,97 +181,97 @@ Quit Anyway?</source>
 Ihre Änderungen zu 
 speichern. Bitte schaffen 
 Sie freien Speicherplatz. 
 Trotzdem beenden?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Aufgaben</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Die Daten können nicht editiert werden.
 Es wird gerade synchronisiert</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>alle Aufgaben?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>alle erledigten Aufgaben?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>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>&lt;P&gt;%1 neue Aufgaben sind angekommen.&lt;p&gt;Wollen Sie diese zu ihren Aufgaben hinzufügen?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Neue Aufgaben</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplizieren</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>E.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorität</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Beschreibung</translation>
+        <translation type="obsolete">Beschreibung</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>fällig bis</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Vorlagen konfigurieren</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um die Priorität der neuen Aufgabe zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Geben Sie hier die Beschreibung der neuen Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>More</source>
         <translation>Weiteres</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Geben Sie hier zusätzliche Informationen für Ihre Aufgabe an.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
@@ -294,96 +294,100 @@ Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann e
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klicken Sie hier, um die Aufgabeninformationen zurück zu setzen.
 Dieser Bereich wird &lt;i&gt;Schnelleingabe&lt;/i&gt; genannt.
 
 Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann ein- und ausgeschaltet werden durch Verwenden des Menüpunkts &lt;b&gt;Optionen-&gt;Schnelleingabe&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Vorlageneditor</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Neu von Vorlage</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Daten können nicht bearbeitet werden, es wird synchronisiert</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Daten können nicht bearbeitet werden, es wird synchronisiert</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabellenansicht</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 Tag(e)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Art</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
diff --git a/i18n/de/tonleiter.ts b/i18n/de/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/de/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/de/zsafe.ts b/i18n/de/zsafe.ts
index 4cee702..5233a01 100644
--- a/i18n/de/zsafe.ts
+++ b/i18n/de/zsafe.ts
@@ -1,51 +1,310 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe Version 2.1.2&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -255,284 +514,314 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.0&lt;br&gt;</source>
-        <translation>ZSafe Version 2.1.0&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe Version 2.1.0&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find entry</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/addressbook.ts b/i18n/en/addressbook.ts
index 8b6d8e6..ea20241 100644
--- a/i18n/en/addressbook.ts
+++ b/i18n/en/addressbook.ts
@@ -1288,216 +1288,49 @@ is provided free !</source>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/en/advancedfm.ts b/i18n/en/advancedfm.ts
index 8a9ac63..532a26c 100644
--- a/i18n/en/advancedfm.ts
+++ b/i18n/en/advancedfm.ts
@@ -222,96 +222,103 @@ and is licensed by the GPL</source>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/appearance.ts b/i18n/en/appearance.ts
index d03a089..7620e42 100644
--- a/i18n/en/appearance.ts
+++ b/i18n/en/appearance.ts
@@ -37,112 +37,96 @@
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
diff --git a/i18n/en/calculator.ts b/i18n/en/calculator.ts
index 5d732d0..2b4a1cc 100644
--- a/i18n/en/calculator.ts
+++ b/i18n/en/calculator.ts
@@ -80,100 +80,96 @@
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
diff --git a/i18n/en/checkbook.ts b/i18n/en/checkbook.ts
index b726534..4bf1fcb 100644
--- a/i18n/en/checkbook.ts
+++ b/i18n/en/checkbook.ts
@@ -1,505 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</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>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</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>
+    <name>QWidget</name>
     <message>
-        <source>Transaction for </source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Withdrawal</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select date of transaction here.</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number:</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter check number here.</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter description of transaction here.</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select transaction category here.</source>
+        <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>Bills</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>
+        <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
+        <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fee:</source>
+        <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
+        <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information for this transaction here.</source>
+        <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Misc</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Electronics</source>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index a6ecc63..f19776b 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -100,96 +100,100 @@ Quit anyway?</source>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -315,96 +319,104 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Yearly...</source>
@@ -465,97 +477,97 @@ Quit anyway?</source>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/doctab.ts b/i18n/en/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/en/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/filebrowser.ts b/i18n/en/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/en/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/gsmtool.ts b/i18n/en/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/en/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/kate.ts b/i18n/en/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/en/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/launchersettings.ts b/i18n/en/launchersettings.ts
index 8cdb19d..1214e2e 100644
--- a/i18n/en/launchersettings.ts
+++ b/i18n/en/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
@@ -105,104 +159,104 @@
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libclockapplet.ts b/i18n/en/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/en/libclockapplet.ts
+++ b/i18n/en/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/en/libfreetypefactory.ts b/i18n/en/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libkeyview.ts b/i18n/en/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/en/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libmemoryapplet.ts b/i18n/en/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/en/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libmpeg3plugin.ts b/i18n/en/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/liboapp.ts b/i18n/en/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libopie.ts b/i18n/en/libopie.ts
index 24385f3..6f1be7c 100644
--- a/i18n/en/libopie.ts
+++ b/i18n/en/libopie.ts
@@ -16,142 +16,150 @@
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
@@ -363,96 +371,100 @@ and </source>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -579,80 +591,256 @@ and </source>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 %2 of every</source>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libopiecore2.ts b/i18n/en/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/en/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libopiedb2.ts b/i18n/en/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libopiemm2.ts b/i18n/en/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libopiepim2.ts b/i18n/en/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libopieui2.ts b/i18n/en/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libqdasher.ts b/i18n/en/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/en/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/libqpe.ts b/i18n/en/libqpe.ts
index 49307d9..9929ffe 100644
--- a/i18n/en/libqpe.ts
+++ b/i18n/en/libqpe.ts
@@ -801,112 +801,96 @@ Free some memory and try again.</source>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
diff --git a/i18n/en/librestartapplet.ts b/i18n/en/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/libtinykate.ts b/i18n/en/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/en/libtinykate.ts
+++ b/i18n/en/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/en/libtodayaddressbookplugin.ts b/i18n/en/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/en/libtodayaddressbookplugin.ts
+++ b/i18n/en/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/libtodaydatebookplugin.ts b/i18n/en/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/en/libtodaydatebookplugin.ts
+++ b/i18n/en/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/libtodaytodolistplugin.ts b/i18n/en/libtodaytodolistplugin.ts
index b423a53..711d14e 100644
--- a/i18n/en/libtodaytodolistplugin.ts
+++ b/i18n/en/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/en/libvtapplet.ts b/i18n/en/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/en/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/light-and-power.ts b/i18n/en/light-and-power.ts
index 0deb0b7..99a08cd 100644
--- a/i18n/en/light-and-power.ts
+++ b/i18n/en/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on AC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/mobilemsg.ts b/i18n/en/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/en/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/oipkg.ts b/i18n/en/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/en/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/op-qws.ts b/i18n/en/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/en/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/opie-login.ts b/i18n/en/opie-login.ts
index f4806d5..0ce0332 100644
--- a/i18n/en/opie-login.ts
+++ b/i18n/en/opie-login.ts
@@ -4,80 +4,80 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/opierec.ts b/i18n/en/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/en/opierec.ts
+++ b/i18n/en/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/ordesktop.ts b/i18n/en/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/osearch.ts b/i18n/en/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/en/osearch.ts
+++ b/i18n/en/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/en/qpe.ts b/i18n/en/qpe.ts
index dde7446..7bc5e05 100644
--- a/i18n/en/qpe.ts
+++ b/i18n/en/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -110,211 +114,221 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/quicklauncher.ts b/i18n/en/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/security.ts b/i18n/en/security.ts
index 57461fe..8b69c6f 100644
--- a/i18n/en/security.ts
+++ b/i18n/en/security.ts
@@ -1,117 +1,230 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24 (default)</source>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/showimg.ts b/i18n/en/showimg.ts
index daea628..bfdbdd6 100644
--- a/i18n/en/showimg.ts
+++ b/i18n/en/showimg.ts
@@ -103,86 +103,83 @@
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/sound.ts b/i18n/en/sound.ts
index 559bf2b..34288a5 100644
--- a/i18n/en/sound.ts
+++ b/i18n/en/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/en/sysinfo.ts b/i18n/en/sysinfo.ts
index 9836d29..2562d28 100644
--- a/i18n/en/sysinfo.ts
+++ b/i18n/en/sysinfo.ts
@@ -43,105 +43,109 @@
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
@@ -154,119 +158,120 @@ Click and hold on a module to see additional information about the module, or to
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Vendor: </source>
+        <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/taboapp.ts b/i18n/en/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/en/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/en/tictac.ts b/i18n/en/tictac.ts
index f8eccb8..1e4a751 100644
--- a/i18n/en/tictac.ts
+++ b/i18n/en/tictac.ts
@@ -1,48 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/en/today.ts b/i18n/en/today.ts
index 74c5ec8..f3b8ffb 100644
--- a/i18n/en/today.ts
+++ b/i18n/en/today.ts
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/todolist.ts b/i18n/en/todolist.ts
index 7f42c48..5887338 100644
--- a/i18n/en/todolist.ts
+++ b/i18n/en/todolist.ts
@@ -161,195 +161,195 @@ The list displays the following information:
         <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>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>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</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>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/tonleiter.ts b/i18n/en/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/en/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/en/zsafe.ts b/i18n/en/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/en/zsafe.ts
+++ b/i18n/en/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 4271ed1..c6bf2d1 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -1303,212 +1303,212 @@ suministra gratis!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestina</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Islas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pulse para introducir nombre y apellidos</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>¡Introduzca el nombre completo directamente! Si los apellidos son varias palabras, por favor, escriba &lt;apellidos&gt;, &lt;nombres&gt; como en &quot;Fernández Barros, José Luis&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>El cargo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>El lugar de trabajo del contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pulse para seleccional el atributo a cambiar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pulse para seleccionar cómo almacenar el nombre (y cómo mostrarlo el la vista en lista)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Tfno. trabajo</translation>
+        <translation type="obsolete">Tfno. trabajo</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax trabajo</translation>
+        <translation type="obsolete">Fax trabajo</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Móvil trabajo</translation>
+        <translation type="obsolete">Móvil trabajo</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Correo-e</translation>
+        <translation type="obsolete">Correo-e</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Correos-e</translation>
+        <translation type="obsolete">Correos-e</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Teléfono casa</translation>
+        <translation type="obsolete">Teléfono casa</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax casa</translation>
+        <translation type="obsolete">Fax casa</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Móvil personal</translation>
+        <translation type="obsolete">Móvil personal</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Oficina</translation>
+        <translation type="obsolete">Oficina</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profesión</translation>
+        <translation type="obsolete">Profesión</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Ayudante</translation>
+        <translation type="obsolete">Ayudante</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Superior</translation>
+        <translation type="obsolete">Superior</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Cónyuge</translation>
+        <translation type="obsolete">Cónyuge</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Género</translation>
+        <translation type="obsolete">Género</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Cumpleaños</translation>
+        <translation type="obsolete">Cumpleaños</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Aniversario</translation>
+        <translation type="obsolete">Aniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Apodo</translation>
+        <translation type="obsolete">Apodo</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Hijos</translation>
+        <translation type="obsolete">Hijos</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nombre</translation>
+        <translation type="obsolete">Nombre</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>1º apellido</translation>
+        <translation type="obsolete">1º apellido</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>2º apellido</translation>
+        <translation type="obsolete">2º apellido</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Sufijo</translation>
+        <translation type="obsolete">Sufijo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Archivar como</translation>
+        <translation type="obsolete">Archivar como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Cargo</translation>
+        <translation type="obsolete">Cargo</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Departamento</translation>
+        <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Compañía</translation>
+        <translation type="obsolete">Compañía</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Calle trabajo</translation>
+        <translation type="obsolete">Calle trabajo</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ciudad trabajo</translation>
+        <translation type="obsolete">Ciudad trabajo</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Provincia trabajo</translation>
+        <translation type="obsolete">Provincia trabajo</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Cód.postal trabajo</translation>
+        <translation type="obsolete">Cód.postal trabajo</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>País trabajo</translation>
+        <translation type="obsolete">País trabajo</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Busca trabajo</translation>
+        <translation type="obsolete">Busca trabajo</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Web trabajo</translation>
+        <translation type="obsolete">Web trabajo</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Calle casa</translation>
+        <translation type="obsolete">Calle casa</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ciudad casa</translation>
+        <translation type="obsolete">Ciudad casa</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Provincia casa</translation>
+        <translation type="obsolete">Provincia casa</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Cód.postal casa</translation>
+        <translation type="obsolete">Cód.postal casa</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>País casa</translation>
+        <translation type="obsolete">País casa</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Web personal</translation>
+        <translation type="obsolete">Web personal</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 4e17ec5..8ca2067 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -249,96 +249,103 @@ y está bajo licencia GPL
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>No pude borrar el directorio actual
 de los favoritos.
 ¡No está marcado como favorito!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Buscar archivo</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>¿Seguro que quiere borrar %1
 y todo su contenido?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>¿Confirma el borrado
 de %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished">Gestor de Ficheros Avanzado :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"> kB libres</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Copiar &quot;%1&quot; como</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salvar salida en fichero(sólo nombre)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>El proceso no pudo empezar</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Error
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Finalizado
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Fijar Permisos Fichero</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Fijar permisos para el fichero:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 533e6d0..ca3a4f3 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -38,109 +38,109 @@
         <translation>Estilo pestañas:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Eestañas con iconos</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Lista donde soltar</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista donde soltar con iconos</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Arriba</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Abajo</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Ventanas</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzada</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>¿Quiere reiniciar ahora?</translation>
+        <translation type="obsolete">¿Quiere reiniciar ahora?</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>Save Scheme</source>
         <translation>Guardar Esquema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Guardar esquema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>El esquema ya existe.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Borrar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Incapaz de borrar el esquema actual.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nuevo&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Los estilos controlan la forma en que elementos como los botones y barras de desplazamiento aparecen en todas las aplicaciones.
 
 Puse aquí para seleccionar un estilo disponible.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Pulse aquí para configurar el estilo seleccionado ahora.
 
 Nota: esta opción no está disponible en todos los estilos.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Las decoraciones de ventana controlan la apariencia del título de la aplicación y sus botones.
 
 Pulse aquí para seleccionar una decoración disponible.</translation>
diff --git a/i18n/es/calculator.ts b/i18n/es/calculator.ts
index 2067367..19e66ae 100644
--- a/i18n/es/calculator.ts
+++ b/i18n/es/calculator.ts
@@ -81,97 +81,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Calculadora</translation>
+        <translation type="obsolete">Calculadora</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Estándar</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Estándar</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index 1c55e32..5d859ea 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -1,524 +1,754 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Chequera</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nueva chequera</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacciones</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduzca aquí el nombre de la chequera.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleccione aquí el tipo de chequera.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Ahorros</translation>
+        <translation type="obsolete">Ahorros</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Comprobando</translation>
+        <translation type="obsolete">Comprobando</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Dinero mercado</translation>
+        <translation type="obsolete">Dinero mercado</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Fondo mutuo</translation>
+        <translation type="obsolete">Fondo mutuo</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Otro</translation>
+        <translation type="obsolete">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>
+        <translation type="obsolete">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>
+        <translation type="obsolete">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>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>
+        <translation type="obsolete">Balance actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Borrar transacción</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger con clave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Pulse aquí para des/habilitar protección con clave de esta chequera.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme clave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Por favor, confirme su clave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Por favor, introduzca su clave para deshabilitar la protección con clave:</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Balance</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Chequera</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduzca símbolo de la moneda:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduzca aquí su símbolo de moneda local.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostrar si la chequera está
 protegida con clave</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>Pulse aquí para seleccionar si la ventana principal debe mostrar que la chequera está protegida con clave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar balances chequera</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Pulse aquí para seleccionar si la ventana principal debe mostrar el balance actual para cada chequera.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</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>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Pulse aquí para configurar esta aplicación.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nobre de la chequera</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Balance</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduzca clave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Por favor, introduzca su clave:</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Fecha</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Ahorros</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Comprobando</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Dinero mercado</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Fondo mutuo</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Otro</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Automóvil</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Facturas</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDs</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Ropa</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Ordenador</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDs</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Electrónica</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Diversión</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Comida</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Combustible</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Varios</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Películas</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Alquiler</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Viaje</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Trabajo</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Miembro familiar</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Crédito misc</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transacción para </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Retirada</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione aquí si la transacción es un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Fecha:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione aquí la fecha de la transacción.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduzca aquí el nº del cheque.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduzca aquí la descripción de la transacción.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione aquí la categoría de la transacción.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione aquí el tipo de transacción.
 
 Las opciones disponibles varían según sea un depósito o una retirada.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Cantidad:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí la cantidad de la transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tasa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduzca aquí cualquier tasa asociada a esta transacción.
 
 El valor introducido debe siempre ser positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduzca aquí cualquier información adicional de esta transacción.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Automóvil</translation>
+        <translation type="obsolete">Automóvil</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Facturas</translation>
+        <translation type="obsolete">Facturas</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDs</translation>
+        <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Ropa</translation>
+        <translation type="obsolete">Ropa</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Ordenador</translation>
+        <translation type="obsolete">Ordenador</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDs</translation>
+        <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Diversión</translation>
+        <translation type="obsolete">Diversión</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Comida</translation>
+        <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Combustible</translation>
+        <translation type="obsolete">Combustible</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varios</translation>
+        <translation type="obsolete">Varios</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Películas</translation>
+        <translation type="obsolete">Películas</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Alquiler</translation>
+        <translation type="obsolete">Alquiler</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaje</translation>
+        <translation type="obsolete">Viaje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Cargo a débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque escrito</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferencia</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Tarjeta crédito</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Trabajo</translation>
+        <translation type="obsolete">Trabajo</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Miembro familiar</translation>
+        <translation type="obsolete">Miembro familiar</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Crédito misc</translation>
+        <translation type="obsolete">Crédito misc</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Electrónica</translation>
+        <translation type="obsolete">Electrónica</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 8e09036..b9969f1 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -104,96 +104,100 @@ Libere espacio y vuelva a intentarlo.
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emitir</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -323,97 +327,97 @@ Libere espacio y vuelva a intentarlo.
     </message>
     <message>
         <source>Defaults</source>
         <translation>Por omisión</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lugar:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoría:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Esta cita dura todo el día.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Ene-00. Ene</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">LMXJVSDL</translation>
+        <translation type="unfinished">LMXJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Lu</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Mi</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Ju</translation>
     </message>
     <message>
         <source>Fr</source>
@@ -469,145 +473,145 @@ Libere espacio y vuelva a intentarlo.
         <source>End Time</source>
         <translation>Hora fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nueva Cita</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoría</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunión</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almuerzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Oficina</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Ene 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Hora inicio</translation>
+        <translation type="unfinished">Hora inicio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona horaria</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarma</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silenciosa</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Audible</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetición</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>No repetir...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descripción </translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inicio - Fin </translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Hora inicio</translation>
+        <translation type="obsolete">Hora inicio</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almuerzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inicio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>El %1 %1 de cada</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/es/doctab.ts b/i18n/es/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/es/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/filebrowser.ts b/i18n/es/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/es/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/gsmtool.ts b/i18n/es/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/es/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/kate.ts b/i18n/es/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/es/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/kpacman.ts b/i18n/es/kpacman.ts
index 959e492..2733df5 100644
--- a/i18n/es/kpacman.ts
+++ b/i18n/es/kpacman.ts
@@ -176,67 +176,71 @@ o está en un formato desconocido.</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>QTOPIA PORT: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PULSE EL CURSOR PARA EMPEZAR</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation> PUNTUACIÓN MAX </translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    ENHORABUENA      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   HA CONSEGUIDO    </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation> UNA BUENA PUNTUACIÓN.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>CLAS   PTS   NOMBRE FECHA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>La fuente de bits no pudo construirse.
 
 El fichero &apos;@PIXMAPNAME@&apos; no existe,
 o está en un formato desconocido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Error al iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/launchersettings.ts b/i18n/es/launchersettings.ts
index 1b26e47..e3f4f95 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configuración del Lanzador</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra de tareas</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menú O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Cargar applets en el Menú O:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pestañas del lanzador en el Menú O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Verificar los applets que quiere incluir en el Menú O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Añadir el contenido de las pestañas del Lanzador como menú en el Menú O.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Muestra 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Muestra 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Muestra 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Pestaña Editar</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Letra</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Inconos</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Vista previa %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta es una somera visión de como se verá la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar una letra personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -106,103 +160,111 @@
         <source>Default</source>
         <translation>Predeterminado</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamaño:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequeño</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Color:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pestañas del Lanzador:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>barra tonta</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuevo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Habilitar indicador de ocupado grande</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Habilitar indicador de ocupado parpadeante</translation>
+        <translation type="obsolete">Habilitar indicador de ocupado parpadeante</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleccione la pestaña del lanzador que quiere editar o borrar.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Añadir una nueva pestaña al Lanzador.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Abrir un nuevo diálogo para personalizar la pestaña seleccionada.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Borra una pestaña del Lanzador.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Active esto si quiere un gran indicador de ocupado en el medio de la pantalla en vez de el de la barra de tareas.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Active esto si quiere un indicador de ocupado parpadeante al iniciar aplicaciones en el Lanzador.</translation>
+        <translation type="obsolete">Active esto si quiere un indicador de ocupado parpadeante al iniciar aplicaciones en el Lanzador.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Todas las pestañas</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>No implementado todavía</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Cargar applets el la barra de tareas:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Compruebe los applets que quiere ver en la barra de tareas.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libclockapplet.ts b/i18n/es/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/es/libclockapplet.ts
+++ b/i18n/es/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/es/libfreetypefactory.ts b/i18n/es/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index a124a27..f5bb58e 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Líquido</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Estilo Líquido</translation>
+        <translation type="unfinished">Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sin transparencia</translation>
+        <translation type="unfinished">Sin transparencia</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Punteado, color de fondo</translation>
+        <translation type="unfinished">Punteado, color de fondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Punteado, color de botón</translation>
+        <translation type="unfinished">Punteado, color de botón</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Punteado translúcido, color de fondo</translation>
+        <translation type="unfinished">Punteado translúcido, color de fondo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Punteado translúcido, color de botón</translation>
+        <translation type="unfinished">Punteado translúcido, color de botón</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Transparencia propia</translation>
+        <translation type="unfinished">Transparencia propia</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Color del menú</translation>
+        <translation type="unfinished">Color del menú</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Color del texto</translation>
+        <translation type="unfinished">Color del texto</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacidad</translation>
+        <translation type="unfinished">Opacidad</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar texto del munú sombreado</translation>
+        <translation type="unfinished">Usar texto del munú sombreado</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Botones de barra de herramientas planos</translation>
+        <translation type="unfinished">Botones de barra de herramientas planos</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Contraste punteado</translation>
+        <translation type="unfinished">Contraste punteado</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Líquido</translation>
+        <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Estilo de alto rendimiento Liquid por Mosfet</translation>
+        <translation type="unfinished">Estilo de alto rendimiento Liquid por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libmemoryapplet.ts b/i18n/es/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/es/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libmpeg3plugin.ts b/i18n/es/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/liboapp.ts b/i18n/es/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopie.ts b/i18n/es/libopie.ts
index 328e2dd..b53ef57 100644
--- a/i18n/es/libopie.ts
+++ b/i18n/es/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Botón Correo</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Botón Inicio</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Botón Grabación</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Rotación de la pantalla</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Minúscula+Arriba</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Minúscula+Abajo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Minúscula+Derecha</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Minúscula+Izquierda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Mayúscula+Arriba</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Mayúscula+Abajo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Mayúscula+Derecha</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Mayúscula+Izquierda</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Tono:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Saturación:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Valor:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rojo:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Seleccione color</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Más</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Más...</translation>
+        <translation type="obsolete">Más...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Diálogo Fichero</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Tipo mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
@@ -364,96 +376,100 @@ y </translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir cada</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Día</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation>en </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Tomar hora:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos los ficheros</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muy alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baja</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muy baja</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progreso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Fecha lí­mite:</translation>
     </message>
     <message>
@@ -581,79 +597,263 @@ y </translation>
         <translation>Nota:</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Cada</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 cada </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>El %1 cada </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Cada </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunes</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martes</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Miércoles</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jueves</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Viernes</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Dirección casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>El %1 %2 de cada</translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>th</source>
         <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiecore2.ts b/i18n/es/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/es/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libopiedb2.ts b/i18n/es/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopiemm2.ts b/i18n/es/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libqdasher.ts b/i18n/es/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/es/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index 69ae925..8cc20ab 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -819,109 +819,97 @@ Libere memoria e intételo de nuevo.</translation>
         <translation>Ene</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>May</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Error</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Error</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Tarjeta CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco duro</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Tarjeta SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco duro SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Almacenamiento interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Tarjeta MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ninguno</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/es/librestartapplet.ts b/i18n/es/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/libtinykate.ts b/i18n/es/libtinykate.ts
index 3e8871a..5f14ff1 100644
--- a/i18n/es/libtinykate.ts
+++ b/i18n/es/libtinykate.ts
@@ -1,24 +1,977 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Ha habido un problema creando
 la información de configuración de
 Kate para este programa.
 
 Por favor, libere algo de especio
 e inténtelo de nuevo.
 </translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index d2824b6..c38da0c 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -1,94 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Máx líneas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Fija el número máximo de líneas que se mostrarán en cada aniversario/cumpleaños</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Cortar línea tras X caracteres: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Después de cuantos caracteres la información sobre la tarea debe ser cortada</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Dias siguientes: </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Cuantos días después debemos buscar</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Para activar configuración: ¡Reinicie la aplicación!</translation>
+        <translation type="unfinished">Para activar configuración: ¡Reinicie la aplicación!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Fijar color cabecera: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>¡Colores de las cabeceras!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Fijar color de entrada: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>¡Este color será usado al mostrar cumpleaños/aniversarios!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Fijar urgente
 Color si debajo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>Días: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>¡Este color urgente será usado si estamos cerca de la cita!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>¡El color urgente será usado si el cumpleaños/aniversario está más próximo que los días dados!</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Módulo LibretaDirecciones</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin cumpleaños en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Próximos aniversarios en &lt;b&gt; %1 &lt;/b&gt; días:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>¡Sin aniversarios en &lt;b&gt; %1 &lt;/b&gt; días!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>¡La base de datos no facilita esta petición de búsqueda! ¡Por favor, actualice libOpie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libvtapplet.ts b/i18n/es/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/es/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/light-and-power.ts b/i18n/es/light-and-power.ts
index 1711aed..43e35ec 100644
--- a/i18n/es/light-and-power.ts
+++ b/i18n/es/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 pasos</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Un sensor de luz ambiental ajusta automáticamente la iluminación de la pantalla. La configuración del brillo aún afecta el brillo medio.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Bajar luz tras</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender tras</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Sin luz tras</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Configuración de Luz y Energía</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>en batería</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Configuración General</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Sólo desactivar LCD (no suspender)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Retroiluminación</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation>Usar sensor de luz</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Calibrar</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Configuración avanzada del sensor de luz</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>enchufada</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Avisos</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Intervalo de aviso</translation>
     </message>
     <message>
         <source> %</source>
         <translation> %</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>A qué nivel de batería debe saltar el aviso de baja energía</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>con qué frecuencia debe ser verificada la energía. Esto determina el ritmo al que aparecerán los avisos</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>A qué nivel de batería debe saltar el aviso de nivel crítico</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>Aviso de batería muy baja al</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>Aviso de nivel crítico al</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Calibración del Sensor</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Completa</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Apagada</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Oscuro</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Claro</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Pasos</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Verificar intervalo</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> seg</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/mobilemsg.ts b/i18n/es/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/es/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/oipkg.ts b/i18n/es/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/es/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/op-qws.ts b/i18n/es/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/es/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 9ba6f1c..3ed76f7 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -6,96 +6,100 @@
 accurately to calibrate your screen.</source>
         <translation>Pulse las cruces firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenido a Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Ingreso</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bienvenido a Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menú</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Contraseña incorrecta</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La contraseña es incorrecta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">Opie ha terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">No pude iniciar Opie.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>No pude pasar a la nueva identidad de usuario</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie fue terminado por
 una señal no capturada
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>No pude iniciar Opie.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/opierec.ts b/i18n/es/opierec.ts
index f2e0470..7a1a2ee 100644
--- a/i18n/es/opierec.ts
+++ b/i18n/es/opierec.ts
@@ -153,60 +153,68 @@ el fichero seleccionado?</translation>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>No pude abrir el fichero de audio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Enviar por IR</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renombrar</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Emitir por IR</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Enviado por IR.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Gra</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lugar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compresión de onda (ocupa menos)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>Mudo auto</translation>
+        <translation type="obsolete">Mudo auto</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>mudo</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/ordesktop.ts b/i18n/es/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
index 474e393..3585b19 100644
--- a/i18n/es/osearch.ts
+++ b/i18n/es/osearch.ts
@@ -32,96 +32,100 @@
     <message>
         <source>Search all</source>
         <translation>Buscar todo</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Sensible may/min</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Usar comodines</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Los detalles del resultado actual</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Introduzca aquí sus términos de búsqueda</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Tareas</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>mostrar</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>ejecutar</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>abrir en el Gestor de Ficheros</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>abrir con</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>mostrar tareas completadas</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>mostrar sucesos pasados</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>buscar en fechas</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fichero: </translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index c2663ef..525b0f7 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema en la aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -194,96 +198,100 @@ Por favor cárguela.</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Lanzador</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Sin aplicación</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;No se ha definido una aplicación para este documento.&lt;p&gt; Tipo %1%.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Buscando documentos</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documentos</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ver como iconos</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Ver como lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 ficheros</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Todos los tipos de ficheros</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Medio insertado</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Imagen</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Video</source>
         <translation type="obsolete">Vídeo</translation>
     </message>
     <message>
         <source>All</source>
@@ -310,181 +318,201 @@ Por favor cárguela.</translation>
         <translation type="obsolete">No preguntar otra vez por este medio</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Estado de la Batería</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">¡El nivel de la batería es crítico!
+        <translation type="obsolete">¡El nivel de la batería es crítico!
 ¡Apágueme o enchúfeme!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">La batería de respaldo está muy baja.
+        <translation type="obsolete">La batería de respaldo está muy baja.
 Por favor cárguela.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">tarjeta de visita</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Terminar Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Reiniciar</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Reiniciar Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Apagar</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancelar</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permitir</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
+        <translation type="obsolete">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contactos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/quicklauncher.ts b/i18n/es/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index 4702b56..d5a9334 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Fijar código</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introducir código</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Código Incorrecto</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>El código introducido es incorrecto.
 Acceso denegado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Teclee nuevo código</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduzca nuevo código</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configuración de Seguridad</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambiar código</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Borrar código</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Solicitar código al encender</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sincronización desde red:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (predefinido)</translation>
+        <translation type="obsolete">192.168.129.0/24 (predefinido)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Cualquiera</translation>
+        <translation type="obsolete">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Ninguna</translation>
+        <translation type="obsolete">Ninguna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Código</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Identificación</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Identificación automática</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/showimg.ts b/i18n/es/showimg.ts
index dea5560..3348e69 100644
--- a/i18n/es/showimg.ts
+++ b/i18n/es/showimg.ts
@@ -103,86 +103,83 @@
         <source>%1 colors</source>
         <translation>%1 colores</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 niveles alpha</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>canal alpha de 8 bits</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>Secuencia</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>Fin secuencia</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Preferencias</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Secuencia</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Lapso entre imágenes</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Repetir secuencia</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Mostrar imágenes al revés</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Cargar imágenes rotadas 90º</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Carga rápida de imágenes</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sound.ts b/i18n/es/sound.ts
index 2a7dba8..ae3d0e7 100644
--- a/i18n/es/sound.ts
+++ b/i18n/es/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Tasa muestreo:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Carpeta grabación:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Tecla grabación:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Límite grabación en segundos:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sin límite</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Reiniciar Opie si es preciso</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Tecla_Grabación</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index 94df81d..bd63585 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -50,104 +50,118 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por la aplicación (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU por el sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Esta página muestra el procesador que está siendo usado.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
+        <translation type="obsolete">Está página muestra cuanta memoria (p.e. RAM) está siendo asignada.
 La memoria se cataloga como sigue:
 
 1. Usada - memoria usada por Opie y cualquier aplicación en ejecución.
 2. Buffers - almacenamiento temporal usada para mejorar el rendimiento.
 3. Cached - información usada recientemente, pero aún no liberada.
 4. Libre - memoria actualmente no usada por ninguna aplicación.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uso#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Usado por</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta es una lista de todos los módulos del kernel actualmente cargados.
 
 Mantenga pulsado un módulo para ver información adicional sobre el módulo, o descargarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione un comando aquí y luego pulse el botón Enviar de la derecha para que lo reciba el módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Pulse aquí para enviar el comando selecciondo al módulo seleccionado arriba.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Seguro que quiere ejecutar
 </translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta área muestra información detallada sobre este módulo.</translation>
@@ -181,118 +195,131 @@ Mantenga pulsado un módulo para ver información adicional sobre el módulo, o
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tiempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta es una lista de todos los procesos de este dispositivo.
 
 Mantenga pulsado un proceso para ver información adicional, o para enviarle una señal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione aquí una señal y luego pulse el botón Enviar de la derecha para enviárselo a este proceso.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Pulse aquí para enviar la señal seleccionada a este proceso.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta área muestra información detallada sobre este proceso.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Seguro que quiere enviar
 </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>¿Seguro que quiere enviar %1 a este proceso?</translation>
+        <translation type="obsolete">¿Seguro que quiere enviar %1 a este proceso?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Información del Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Almacenamiento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versión</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Fecha compilación: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versión: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modelo: </translation>
+        <translation type="obsolete">&lt;p&gt;Modelo: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Proveedor: </translation>
+        <translation type="obsolete">&lt;p&gt;Proveedor: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página muestra la versión actual de Opie, del kernel Linux y de la distribución corriendo es este dispositivo.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/es/taboapp.ts b/i18n/es/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/es/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/es/tictac.ts b/i18n/es/tictac.ts
index 29fdca9..c1ab3c0 100644
--- a/i18n/es/tictac.ts
+++ b/i18n/es/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>TicTac</translation>
+        <translation type="obsolete">TicTac</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Empieza el ordenador</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Empieza el humano</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Juegar!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Salir</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Pulsa Jugar para empezar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Haz tu movimiento</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>¡Tú ganas!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>¡El ordenador gana!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 75e2b01..c7d2fcb 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Hoy</translation>
+        <translation type="obsolete">Hoy</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Pertenece a </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor, rellene su información personal</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>No encontré módulos</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Ningún módulo activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Piche aquí para lanzar la aplicación asociada</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoy</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Pinche aquí para obtener el diálogo de configuración</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoy por Maximilian Reiß</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Cargar qué módulos en qué orden:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 4f6a9d4..ad0e93a 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -177,97 +177,97 @@ Quit Anyway?</source>
 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 type="obsolete">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>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="obsolete">Descripción</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Platillas</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridad:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Editor de plantillas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nueva plantilla %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para fijar la prioridad de la nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
@@ -295,96 +295,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para introducir información adicional en una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Introducir</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para añadir una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Pulse aquí para reiniciar la información de una nueva tarea.
 
 Esta área se llama barra rápida de tareas.
 
 Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mostrarse o esconderse en las Opciones del menú.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Los datos no pueden ser editados, estoy sincronizando</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de tablas</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descripción:</translation>
diff --git a/i18n/es/tonleiter.ts b/i18n/es/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/es/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/es/zsafe.ts b/i18n/es/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index 8512994..faab78f 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -1312,212 +1312,212 @@ founi gratuitement !</translation>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Zone de Souveraineté Palestinienne</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Iles Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Sélectionnez le pour saisir nom, prénom et second prénom</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Entrez le nom complet directement ! Si le nom est composé de plusieurs mots (par exemple &quot;De Gaulle&quot;) , saisissez &lt;Nom&gt;,&lt;Prénom&gt; comme ceci : &quot;De Gaulle, Général&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Fonction dans l&apos;entreprise..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Par exemple &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Le lieu de travail du contact</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Sélectionnez le pour choisir le champ à modifier</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Permet de choisir le format du nom complet (et comment il s&apos;affiche en mode liste)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Tél (Bur.)</translation>
+        <translation type="obsolete">Tél (Bur.)</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax (Bur.)</translation>
+        <translation type="obsolete">Fax (Bur.)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Mobile (Bur.)</translation>
+        <translation type="obsolete">Mobile (Bur.)</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Email par défaut</translation>
+        <translation type="obsolete">Email par défaut</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Emails</translation>
+        <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Tél (Dom.)</translation>
+        <translation type="obsolete">Tél (Dom.)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax (Dom.)</translation>
+        <translation type="obsolete">Fax (Dom.)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Mobile (Perso.)</translation>
+        <translation type="obsolete">Mobile (Perso.)</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Service</translation>
+        <translation type="obsolete">Service</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profession</translation>
+        <translation type="obsolete">Profession</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistant(e)</translation>
+        <translation type="obsolete">Assistant(e)</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Responsable</translation>
+        <translation type="obsolete">Responsable</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Epou(x|se)</translation>
+        <translation type="obsolete">Epou(x|se)</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Type</translation>
+        <translation type="obsolete">Type</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Date de Naissance</translation>
+        <translation type="obsolete">Date de Naissance</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Anniversaire</translation>
+        <translation type="obsolete">Anniversaire</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Surnom</translation>
+        <translation type="obsolete">Surnom</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Enfant(s)</translation>
+        <translation type="obsolete">Enfant(s)</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titre</translation>
+        <translation type="obsolete">Titre</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Prénom</translation>
+        <translation type="obsolete">Prénom</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>2nd Prénom</translation>
+        <translation type="obsolete">2nd Prénom</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Nom</translation>
+        <translation type="obsolete">Nom</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Suffixe</translation>
+        <translation type="obsolete">Suffixe</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Lister sous</translation>
+        <translation type="obsolete">Lister sous</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Fonction</translation>
+        <translation type="obsolete">Fonction</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Département</translation>
+        <translation type="obsolete">Département</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Société</translation>
+        <translation type="obsolete">Société</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Rue (Bur.)</translation>
+        <translation type="obsolete">Rue (Bur.)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Ville (Bur.)</translation>
+        <translation type="obsolete">Ville (Bur.)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Département (Bur.)</translation>
+        <translation type="obsolete">Département (Bur.)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Code Postal (Bur.)</translation>
+        <translation type="obsolete">Code Postal (Bur.)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Pays (Bur.)</translation>
+        <translation type="obsolete">Pays (Bur.)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Alphapage (Bur.)</translation>
+        <translation type="obsolete">Alphapage (Bur.)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Page Web (Bur.)</translation>
+        <translation type="obsolete">Page Web (Bur.)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Rue (Dom.)</translation>
+        <translation type="obsolete">Rue (Dom.)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Ville (Dom.)</translation>
+        <translation type="obsolete">Ville (Dom.)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Département (Dom.)</translation>
+        <translation type="obsolete">Département (Dom.)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Code Postal (Dom.)</translation>
+        <translation type="obsolete">Code Postal (Dom.)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Pays (Dom.)</translation>
+        <translation type="obsolete">Pays (Dom.)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Page Web (Perso.)</translation>
+        <translation type="obsolete">Page Web (Perso.)</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Note</translation>
+        <translation type="obsolete">Note</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index 69f13a3..b77d594 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -260,96 +260,103 @@ Ce n&apos;en est pas un!!</translation>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>Impossible d&apos;effacer le répertoire
 courant des favoris.
 Ce n&apos;est pas un favoris !</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Recherche Fichier</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>Voulez-vous réellement
 supprimer %1
 et tout son contenu ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>Confirmer suppression de
 %1 ?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>Explorateur :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>Ko libre</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Ouvrir Liste 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Ouvrir Liste 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Pas Encore Implémenté</translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Enregistrer la sortie dans un fichier</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Sortie</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Le processus n&apos;a pas pu démarrer</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Erreur
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Terminé
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Définir Permissions</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Définir permissions de : </translation>
     </message>
     <message>
         <source>owner</source>
         <translation>propriétaire</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groupe</translation>
     </message>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index e089c8b..f865270 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -40,109 +40,109 @@
         <translation>Type Onglets : </translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Onglets simple</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Onglets + icônes</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Liste déroulante</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Liste déroulante + icônes</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Style</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Fenêtre</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avancé</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Redémarrer</translation>
+        <translation type="obsolete">Redémarrer</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Voulez-vous redémarrer %1 maintenant ?</translation>
+        <translation type="obsolete">Voulez-vous redémarrer %1 maintenant ?</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>Save Scheme</source>
         <translation>Enregister le thème</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Enregistrer le thème</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Le thème existe déjà.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Supprimer le thème</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossible de supprimer le thème courant.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nouveau&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Les styles contrôles la manière dont les champs comme les boutons ou les barres d&apos;ascenceurs sont affichés dans toutes les applications.
 
 Cliquez ici pour sélectionner un style disponible.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Cliquez ici pour configurer le style actuellement sélectionné.
 
 Note : Cette option n&apos;est pas disponible pour tous les styles.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Les décorations de fenêtres contrôlent la manière dont les barres de titres et les bouttons des applications apparaissent.
 
 Cliquez ici pour sélectionner une décoration disponible.</translation>
diff --git a/i18n/fr/calculator.ts b/i18n/fr/calculator.ts
index 460ac88..06d19bf 100644
--- a/i18n/fr/calculator.ts
+++ b/i18n/fr/calculator.ts
@@ -82,97 +82,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>,</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Calculatrice</translation>
+        <translation type="obsolete">Calculatrice</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Masse</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distance</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Surface</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Températures</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>carats</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 20434bf..d023f16 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -1,526 +1,756 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de Compte</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nouveau livre</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transactions</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Graphiques</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Entrez le nom du livre de compte ici.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Sélectionnez le type de livre ici.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Epargne</translation>
+        <translation type="obsolete">Epargne</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Compte chèque</translation>
+        <translation type="obsolete">Compte chèque</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Liquidités</translation>
+        <translation type="obsolete">Liquidités</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Fond de pension</translation>
+        <translation type="obsolete">Fond de pension</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Autre</translation>
+        <translation type="obsolete">Autre</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banque : </translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Entrez ici le nom de la banque de ce livre.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>N° compte : </translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Entrez ici le n° du compte de ce livre de compte.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>N° PIN : </translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Entrez le numéro de PIN pour ce livre de compte ici.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Solde : </translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Entrez le solde initial pour ce livre de compte ici.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Entrez les informations supplémentaires pour ce livre de compte ici.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Solde actuel: %10.00</translation>
+        <translation type="obsolete">Solde actuel: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Cette partie affiche le solde courant de ce livre de compte.</translation>
+        <translation type="obsolete">Cette partie affiche le solde courant de ce livre de compte.</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>Ceci est la liste de toutes les transactions entrées pour ce livre de compte.
 
 Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de la colonne.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Montant</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Cliquez ici pour ajouter une nouvelle transaction.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Sélectionnez une transaction et cliquez ici pour l&apos;éditer.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Sélectionnez un livre de compte et cliquez ici pour l&apos;effacer.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Sélectionnez le graphique désiré ci-dessous et cliquez sur le boutton Dessiner.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Cliquez ici pour sélectionner le type de graphique désiré.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Solde du compte</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Retrait par catégorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Dépôt par catégorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Dessiner</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Cliquez ici pour dessiner le graphique sélectionné.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Solde actuel : %1 %2</translation>
+        <translation type="obsolete">Solde actuel : %1 %2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Supprimer la transaction</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protéger par mot de passe</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Cliquez ici pour activer/désactiver la protection du livre de compte par mot de passe.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Veuillez entrer votre mot de passe : </translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirmer le mot de passe</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Veuillez confirmer votre mot de passe : </translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Veuillez entrer votre mot de passe pour confirmer la désactivation de la protection par mot de passe : </translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Solde</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurer &quot;Livre de compte&quot;</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Entrer le symbole de la devise : </translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Entrez le symbole de la devise locale ici.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Montrer si le livre de compte est protégé
 par mot de passe</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>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera si le &quot;livre de compte&quot; est protégé par mot de passe.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Montrer le solde des livres de compte</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Cliquez ici pour sélectionner si, oui ou non, la fenêtre principale affichera le solde pour chaque livre de compte.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Supprimer</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Livre de compte</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Cliquez ici pour créer un nouveau livre de compte.
 
 Vous pouvez aussi sélectionner &quot;Nouveau&quot; à partir du menu de Livre de Compte.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</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>Sélectionnez un livre de compte puis cliquez ici pour l&apos;éditer.
 
 Vous pouvez aussi sélectionner &quot;Éditer&quot; à partir du menu de &quot;Livre de Compte&quot;, ou bien cliquez
 en maintenant appuyé sur le nom d&apos;un livre de compte.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Sélectionnez un livre de compte puis cliquez ici pour le détruire.
 
 Vous pouvez aussi cliquer sur &quot;Supprimer&quot; à partir du menu de &quot;Livre de compte&quot;.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Voici une liste de tous les livres de compte disponibles actuellement.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Supprimer un livre de compte</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Cliquez ici pour configurer cette application.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nom du Livre de Compte</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Solde</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Entrer un mot de passe</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Veuillez entrer un mot de passe : </translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Date</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editer</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Nouveau</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Supprimer</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Epargne</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Compte chèque</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Liquidités</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Fond de pension</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Autre</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Véhicule</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Factures</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDs</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Vêtements</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Ordinateur</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDs</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Electroniques</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Loisirs</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Alimentation</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Carburant</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Divers</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Cinéma</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Location</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Voyage</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Professionnel</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Personnel</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Crédit Divers</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transaction sur </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Débit</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Sélectionnez ici le type d&apos;opération, débit ou crédit.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Crédit</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Date:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Sélectionnez la date de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numéro : </translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Entrez le numéro de chèque ici.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Entrez la description de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Sélectionnez la catégorie de l&apos;opération ici.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Sélectionnez le type d&apos;opération ici.
 
 Les options disponibles varient suivant le type d&apos;opération : débit ou crédit.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Montant : </translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant de l&apos;opération ici.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Frais : </translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Entrez le montant des frais bancaires associés à l&apos;opération.
 
 La valeur entrée devrait toujours être positive.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Entrez ici les informations complémentaires sur l&apos;opération.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Véhicule</translation>
+        <translation type="obsolete">Véhicule</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Factures</translation>
+        <translation type="obsolete">Factures</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDs</translation>
+        <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Vêtements</translation>
+        <translation type="obsolete">Vêtements</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Ordinateur</translation>
+        <translation type="obsolete">Ordinateur</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDs</translation>
+        <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electronique</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Loisirs</translation>
+        <translation type="obsolete">Loisirs</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Alimentation</translation>
+        <translation type="obsolete">Alimentation</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Carburant</translation>
+        <translation type="obsolete">Carburant</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Divers</translation>
+        <translation type="obsolete">Divers</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Cinéma</translation>
+        <translation type="obsolete">Cinéma</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Location</translation>
+        <translation type="obsolete">Location</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Voyage</translation>
+        <translation type="obsolete">Voyage</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Paiement</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Chèque</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Virement</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Carte de crédit</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Professionnel</translation>
+        <translation type="obsolete">Professionnel</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Personnel</translation>
+        <translation type="obsolete">Personnel</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Crédit Divers</translation>
+        <translation type="obsolete">Crédit Divers</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Virement automatique</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Liquide</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Electroniques</translation>
+        <translation type="obsolete">Electroniques</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index 452dd4f..cda286e 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -107,96 +107,100 @@ Quitter ?</translation>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emettre</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horaire</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -327,97 +331,97 @@ dans : </translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Par défaut</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Emplacement:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>C&apos;est un événement qui dure toute la journée.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">LMMJVSDL</translation>
+        <translation type="unfinished">LMMJVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>Sem: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="obsolete">L</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">M</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="obsolete">J</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="obsolete">V</translation>
     </message>
     <message>
@@ -475,149 +479,149 @@ début</translation>
         <translation>Heure de
 fin</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nouvel événement</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lieu</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Rendez-vous</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Déjeuner</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Dîner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Voyage</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Bureau</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domicile</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Heure
+        <translation type="unfinished">Heure
 de début</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Toute la
 Journée</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zone
 Horaire
 </translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> mn</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Muette</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Forte</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Répétition</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Pas de répétition...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Description</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Début - Fin</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Heure de
+        <translation type="obsolete">Heure de
 début</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fin</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Tous les %1 de chaque </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Les %2 %1 de chaque </translation>
     </message>
     <message>
diff --git a/i18n/fr/doctab.ts b/i18n/fr/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/fr/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/gsmtool.ts b/i18n/fr/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/fr/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/helpbrowser.ts b/i18n/fr/helpbrowser.ts
index 7cc2102..9c591d7 100644
--- a/i18n/fr/helpbrowser.ts
+++ b/i18n/fr/helpbrowser.ts
@@ -1,42 +1,42 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>HelpBrowser</name>
     <message>
         <source>Backward</source>
         <translation>Retour</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Avancer</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Début</translation>
     </message>
     <message>
         <source>Add Bookmark</source>
         <translation>Ajouter Favoris</translation>
     </message>
     <message>
         <source>Remove from Bookmarks</source>
         <translation>Effacer Favoris</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Favoris</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Aide HTML</translation>
     </message>
     <message>
         <source>HelpBrowser</source>
-        <translation>Aide HTML</translation>
+        <translation type="obsolete">Aide HTML</translation>
     </message>
     <message>
         <source>Go</source>
         <translation>Go</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/kate.ts b/i18n/fr/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/fr/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index c520fe8..c64b6b9 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -186,67 +186,71 @@ ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>PORTAGE QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>TOUCHE DE DIRECTION DEMARRER</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>MEILLEUR SCORE</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>FELICITATIONS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>VOUS AVEZ REUSSIT</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>UN SCORE DANS LE TOP 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK SCORE NOM DATE</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>EN PAUSE</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>L&apos;image ne peut-être construite.
 
 Le fichier &apos;@PIXMAPNAME@&apos; n&apos;existe pas,
 ou est dans un format inconnu.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Erreur d&apos;Initialisation</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/launchersettings.ts b/i18n/fr/launchersettings.ts
index 06bd0fc..8512cf3 100644
--- a/i18n/fr/launchersettings.ts
+++ b/i18n/fr/launchersettings.ts
@@ -1,87 +1,141 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Paramètres du Bureau</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barre des tâches</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menu O</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Onglets</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Afficher ces icônes dans le menu O : </translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Afficher les onglets dans le menu O</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Choisissez les icônes à afficher dans le menu O.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Permet d&apos;afficher le contenu des onglets du bureau dans le menu O.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Exemple 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Exemple 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Exemple 3</translation>
     </message>
 </context>
 <context>
     <name>SampleView</name>
     <message>
         <source>Sample 1</source>
         <translation type="obsolete">Exemple 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="obsolete">Exemple 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="obsolete">Exemple 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Editeur d&apos;onglets</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fond d&apos;écran</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Police</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icônes</translation>
@@ -122,103 +176,111 @@
         <source>Default</source>
         <translation>Réglages par défaut</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Taille : </translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Petite</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Couleur : </translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Onglets du bureau : </translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Afficher le sablier élargi</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Afficher le sablier clignotant</translation>
+        <translation type="obsolete">Afficher le sablier clignotant</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Sélectionnez l&apos;onglet que vous voulez Editer ou Effacer.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Ajouter un nouvel onglet au bureau.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Ouvrir une boîte de dialogue pour personnaliser l&apos;onglet sélectionné.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Effacer un onglet du bureau.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Activez ceci si vous voulez afficher un gros sablier au milieu de l&apos;écran au lieu de celui qui apparait dans la barre des tâches.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Activez ceci si vous voulez afficher un sablier clignotant quand vous démarrez une application.</translation>
+        <translation type="obsolete">Activez ceci si vous voulez afficher un sablier clignotant quand vous démarrez une application.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Tous les onglets</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Pas encore implanté</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Afficher ces icônes dans la barre des tâches : </translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Choisissez les icônes à afficher dans la barre des tâches.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libfreetypefactory.ts b/i18n/fr/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libliquid.ts b/i18n/fr/libliquid.ts
index 5c19949..170042a 100644
--- a/i18n/fr/libliquid.ts
+++ b/i18n/fr/libliquid.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Thème Liquide</translation>
+        <translation type="unfinished">Thème Liquide</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Pas de transparence</translation>
+        <translation type="unfinished">Pas de transparence</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Pointillé, couleur de fond</translation>
+        <translation type="unfinished">Pointillé, couleur de fond</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Pointillé, couleur de bouton</translation>
+        <translation type="unfinished">Pointillé, couleur de bouton</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Pointillé translucide, couleur de fond</translation>
+        <translation type="unfinished">Pointillé translucide, couleur de fond</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Pointillé translucide, couleur de bouton</translation>
+        <translation type="unfinished">Pointillé translucide, couleur de bouton</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Personalisation de la transparence</translation>
+        <translation type="unfinished">Personalisation de la transparence</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Couleur des menus</translation>
+        <translation type="unfinished">Couleur des menus</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Couleur du texte</translation>
+        <translation type="unfinished">Couleur du texte</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacité</translation>
+        <translation type="unfinished">Opacité</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Utiliser des menus ombrés</translation>
+        <translation type="unfinished">Utiliser des menus ombrés</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Rendre unis les buttons de la barre des outils</translation>
+        <translation type="unfinished">Rendre unis les buttons de la barre des outils</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Contraste pointillé</translation>
+        <translation type="unfinished">Contraste pointillé</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquide</translation>
+        <translation type="unfinished">Liquide</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Thème liquide haute performance par Mosfet</translation>
+        <translation type="unfinished">Thème liquide haute performance par Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libmemoryapplet.ts b/i18n/fr/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/fr/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libmpeg3plugin.ts b/i18n/fr/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/liboapp.ts b/i18n/fr/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libopie.ts b/i18n/fr/libopie.ts
index 89a970e..009db95 100644
--- a/i18n/fr/libopie.ts
+++ b/i18n/fr/libopie.ts
@@ -17,141 +17,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Bouton E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Bouton Home</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Bouton Enregistrement</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Rotation Ecran</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Haut</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Bas</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Droite</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Maj-Haut</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Maj-Bas</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Maj-Droite</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Maj-Gauche</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Nuance:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sat : </translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val : </translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rouge : </translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Vert : </translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Bleu : </translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal Apha : </translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Sélectionner Couleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Ajouter...</translation>
+        <translation type="obsolete">Ajouter...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Sélection Fichier</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Ouvrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregistrer</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nom : </translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Type Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
@@ -365,186 +377,190 @@ et </translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Di</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semaine(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Type Répétition</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>année(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Heure : </translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Choisir Heure : </translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Tous les Fichiers</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notes : </translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorité : </translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Très haute</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Haute</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Très Faible</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Etat : </translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Délai : </translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Catégorie : </translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-Mail par Défaut : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Service : </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Tél (bur.):</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax (bur.):</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Mobile (bur.):</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Radiomessage : </translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (dom.):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Page Web (bur.):</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Téléphone (dom.):</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax (dom.):</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Mobile (perso):</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>E-Mail(s) : </translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Profession : </translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistant(e) : </translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Responsable : </translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Homme</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Femme</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Epou(x|se) : </translation>
@@ -594,69 +610,253 @@ plusieurs jours</translation>
     <message>
         <source>Every</source>
         <translation>Chaque </translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 chaque</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Le %1 chaque</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Le %2 %1 chaque </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Chaque</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lundi</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Mardi</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercredi</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Jeudi</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vendredi</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Samedi</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Dimanche</translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>,</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>,</translation>
     </message>
     <message>
         <source>th</source>
         <translation>,</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libopiecore2.ts b/i18n/fr/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/fr/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libopiedb2.ts b/i18n/fr/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libopiemm2.ts b/i18n/fr/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libopiepim2.ts b/i18n/fr/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libopieui2.ts b/i18n/fr/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libqdasher.ts b/i18n/fr/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/fr/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index 1ee56a7..64d738f 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -826,109 +826,109 @@ Libérez de la mémoire et réessayez.</translation>
     <message>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Déc</translation>
     </message>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation>Cliquez pour fermer cette fenêtre et abandonner les modifications.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Cliquez pour fermer cette fenêtre.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Cliquez pour fermer cette fenêtre et appliquer les modifications.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation>Cliquez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation>Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
     </message>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qu&apos;est ce que...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Voulez-vous vraiment supprimer
 %1 ?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Erreur</translation>
+        <translation type="obsolete">Erreur</translation>
     </message>
     <message>
         <source>Could not find the application </source>
-        <translation>L&apos;application n&apos;a pas été trouvée</translation>
+        <translation type="obsolete">L&apos;application n&apos;a pas été trouvée</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>Could not start the application </source>
-        <translation>L&apos;application n&apos;a pas été lancée</translation>
+        <translation type="obsolete">L&apos;application n&apos;a pas été lancée</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="obsolete">&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="obsolete">Qu&apos;est ce que...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="obsolete">Cliquez pour fermer cette fenêtre et abandonner les changements.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="obsolete">Cliquez pour fermer cette fenêtre.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="obsolete">Cliquez pour fermer cette fenêtre et appliquer les changements.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="obsolete">Clqiuez pour rendre cette fenêtre déplaçable.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="obsolete">Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Carte CF</translation>
diff --git a/i18n/fr/librestartapplet.ts b/i18n/fr/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/libtinykate.ts b/i18n/fr/libtinykate.ts
index 7c1420e..40d961e 100644
--- a/i18n/fr/libtinykate.ts
+++ b/i18n/fr/libtinykate.ts
@@ -1,24 +1,977 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plus de Mémoire</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Un problème est apparu lors de la
 création de la configuration de Kate
 pour ce programme.
 
 Veuillez libérer de la mémoire avant
 de rééssayer.</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/fr/libtodayaddressbookplugin.ts b/i18n/fr/libtodayaddressbookplugin.ts
index 8ef1f52..8bd5879 100644
--- a/i18n/fr/libtodayaddressbookplugin.ts
+++ b/i18n/fr/libtodayaddressbookplugin.ts
@@ -1,99 +1,119 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Lignes Max:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Définit le maximum de ligne qui devront être affichées pour chaque Date de naissance/Anniversaire</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Couper la ligne après X caractères:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Après combien de caractères doit-être coupé l&apos;information sur la tâche</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Jours en avant : </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Combien de jours pour aller de l&apos;avant</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Pour activer les changement: Redémarrez l&apos;application !</translation>
+        <translation type="unfinished">Pour activer les changement: Redémarrez l&apos;application !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Couleurs des Titres : </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Couleurs des titres !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Couleur des Entrées : </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Cette couleur sera utilisée pour afficher les dates de Naissances/Anniversaire !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Défini Couleur
 d&apos;Urgence</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>
 jours</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Couleur utilisé si l&apos;évènement est proche !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>La Couleur d&apos;Urgence est utilisée si les dates sont plus proches que le nombre défini de jours !</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Module &quot;Contacts&quot;</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prochain anniversaire de naissance
 prévu dans &lt;b&gt;%1&lt;/b&gt; jour(s):</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Pas d&apos;anniversaire de naissance prévu
 dans les &lt;b&gt;%1&lt;/b&gt; prochains jours !</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prochain anniversaire dans &lt;b&gt;%1&lt;/b&gt; jour(s):</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Pas d&apos;anniversaire dans les &lt;b&gt;%1&lt;/b&gt;
 prochains jours !</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>La base de données ne permet pas ce type de recherche ! Mettez à jour libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libvtapplet.ts b/i18n/fr/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/fr/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/light-and-power.ts b/i18n/fr/light-and-power.ts
index 93997ff..704bb4c 100644
--- a/i18n/fr/light-and-power.ts
+++ b/i18n/fr/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 Pas</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Quand vous utilisez votre appareil, la luminosité de l&apos;écran peut être ajustée automatiquement grace au système de mesure de la lumière ambiente. Le réglage de luminosité affecte la luminosité moyenne.</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Eteindre après</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Diminuer  après</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Mettre en veille après</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Eteint</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Paramètres Ecran et Batterie</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>Sur Batterie</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Réglages Généraux</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>jamais</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Désactiver l&apos;écran
 (ne met pas en veille)</translation>
     </message>
     <message>
         <source>Backlight</source>
@@ -69,85 +76,97 @@
         <source>Use Light Sensor</source>
         <translation>Utiliser le capteur
 de lumière</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Calibrer</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Réglages avancés du capteur de lumière</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>Sur secteur</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Avertissements</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Message Batterie faible</translation>
     </message>
     <message>
         <source> %</source>
         <translation>%</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>Niveau de la batterie à partir duquel le message &quot;Batterie faible&quot; s&apos;affichera</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>Fréquence de vérification de la batterie et d&apos;affichage du message &quot;Batterie faible&quot;</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>Niveau de la batterie à partir duquel le message &quot;Batterie vide&quot; s&apos;affichera</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>Message Batterie très faible</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>Message Batterie critique</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Calibrage du Capteur</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Pleine</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Eteint</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Sombre</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Claire</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Pas</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Interval de vérif.</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/mobilemsg.ts b/i18n/fr/mobilemsg.ts
index 28ccd73..5cd3e46 100644
--- a/i18n/fr/mobilemsg.ts
+++ b/i18n/fr/mobilemsg.ts
@@ -1,73 +1,89 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MobileMsg</name>
     <message>
         <source>Messages: </source>
-        <translation>Messages :</translation>
+        <translation type="obsolete">Messages :</translation>
     </message>
 </context>
 <context>
     <name>MobileMsgBase</name>
     <message>
         <source>Mobile Messaging</source>
         <translation>Message du Mobile</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nombre :</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Texte</translation>
+        <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Flash</source>
         <translation>Flasher</translation>
     </message>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
         <source>SMS: %1</source>
-        <translation>SMS : %1</translation>
+        <translation type="obsolete">SMS : %1</translation>
     </message>
     <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
         <source>Country:</source>
-        <translation>Pays :</translation>
+        <translation type="obsolete">Pays :</translation>
     </message>
     <message>
         <source>Logo</source>
-        <translation>Logo</translation>
+        <translation type="obsolete">Logo</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation>Groupe</translation>
+        <translation type="obsolete">Groupe</translation>
     </message>
     <message>
         <source>Picture</source>
-        <translation>Image</translation>
+        <translation type="obsolete">Image</translation>
     </message>
     <message>
         <source>Message:</source>
-        <translation>Message :</translation>
+        <translation type="obsolete">Message :</translation>
     </message>
     <message>
         <source>EMS</source>
         <translation>EMS</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation>Tab</translation>
+        <translation type="obsolete">Tab</translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/op-qws.ts b/i18n/fr/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/fr/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/opie-login.ts b/i18n/fr/opie-login.ts
index 8378bdc..8a2d294 100644
--- a/i18n/fr/opie-login.ts
+++ b/i18n/fr/opie-login.ts
@@ -6,95 +6,99 @@
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez et gardez la pression sur croix pour calibrer votre écran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bienvenue sur Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Connexion</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bienvenue sur Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspendre</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Mauvais mot de passe</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Le mot de passe est incorrect.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">Opie s&apos;est terminé
 par un signal &quot;uncaught
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Impossible de démarrer Opie.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Impossible de changer d&apos;utilisateur</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie a été terminé par un
 signal non pris en charge
 (%1)</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Impossible de démarrer Opie.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/opieplayer.ts b/i18n/fr/opieplayer.ts
index f8fe968..30b47ca 100644
--- a/i18n/fr/opieplayer.ts
+++ b/i18n/fr/opieplayer.ts
@@ -160,103 +160,103 @@ Fermeture du lecteur en cours.</translation>
         <translation>Plein écran</translation>
     </message>
     <message>
         <source>Scale</source>
         <translation>Echelle</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Remonter</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>Title</source>
         <translation>Titre</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Media</source>
         <translation>Média</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
     </message>
     <message>
         <source>Video</source>
         <translation>Video</translation>
     </message>
     <message>
         <source>Lists</source>
         <translation>Listes</translation>
     </message>
     <message>
         <source>OpiePlayer: </source>
         <translation>OpiePlayer : </translation>
     </message>
     <message>
         <source>Out of space</source>
-        <translation>Plus de mémoire</translation>
+        <translation type="obsolete">Plus de mémoire</translation>
     </message>
     <message>
         <source>There was a problem saving the playlist.
 Your playlist may be missing some entries
 the next time you start it.</source>
-        <translation>Un problème est survenu lors de la sauvegarde
+        <translation type="obsolete">Un problème est survenu lors de la sauvegarde
 de la liste. Votre liste sera peut-être incomplète
 lors du prochain chargement.</translation>
     </message>
     <message>
         <source>Invalid File</source>
         <translation>Fichier non valide</translation>
     </message>
     <message>
         <source>There was a problem in getting the file.</source>
         <translation>Un problème est survenu lors du chargement du fichier.</translation>
     </message>
     <message>
         <source>Remove Playlist?</source>
         <translation>Supprimer la liste ?</translation>
     </message>
     <message>
         <source>You really want to delete
 this playlist?</source>
         <translation>Voulez-vous vraiment détruire
 cette liste?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Properties</source>
         <translation>Propriétés</translation>
     </message>
     <message>
         <source>Play Selected</source>
         <translation>Lire la Sélection</translation>
     </message>
     <message>
         <source>Open file or URL</source>
         <translation>Ouvrir fichier ou URL</translation>
     </message>
     <message>
         <source>Save m3u Playlist </source>
         <translation>Sauver Liste m3u</translation>
     </message>
     <message>
         <source>Skins</source>
         <translation>Skins</translation>
diff --git a/i18n/fr/opierec.ts b/i18n/fr/opierec.ts
index ceb93e3..31c2d08 100644
--- a/i18n/fr/opierec.ts
+++ b/i18n/fr/opierec.ts
@@ -153,60 +153,68 @@ des fichiers sélectionnés ?</translation>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Impossible d&apos;ouvrir le fichier audio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Emettre par IrDa</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Renommer</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Emission Ir</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir envoyé.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Rec</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Emplacement</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compression (fichiers plus petits)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>Silence auto </translation>
+        <translation type="obsolete">Silence auto </translation>
     </message>
     <message>
         <source>mute</source>
         <translation>Silence</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stopper</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/ordesktop.ts b/i18n/fr/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/osearch.ts b/i18n/fr/osearch.ts
index fb7d788..5203047 100644
--- a/i18n/fr/osearch.ts
+++ b/i18n/fr/osearch.ts
@@ -13,96 +13,100 @@
     <message>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Tâches</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contact</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Rechercher tous</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Sensible à la casse</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Utiliser les jokers</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Entrez les termes recherchés ici</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Résultats</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
         <translation>montrer les tâches terminées</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>montrer évènements passés</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>rechercher dates</translation>
     </message>
     <message>
         <source>show</source>
         <translation>montrer</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editer</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>lancer</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>ouvrir dans le gestionnaire de fichiers</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Fichier :</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Lien : </translation>
     </message>
     <message>
         <source>Mimetype: </source>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 18d1841..cdf481b 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -1,64 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Langue</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Heure et Date</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Information Personnelle</translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problème Application</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Voulez-vous forcer l&apos;application à quitter ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Le chargement rapide a été désactivé pour cette application. Cliquez et maintenez la pression sur l&apos;icône pour la réactiver.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; a été terminée par le signal %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>Application terminée</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Application non trouvée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
@@ -195,96 +199,100 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document.&lt;p&gt;Type %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Recherche de documents</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Aperçu en texte</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Recherche Documents...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vue Icône</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vue Liste</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">Fichiers %1</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Tous les fichiers</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Tous types</translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Media inséré</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouru à la recherche de fichiers?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Image</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Texte</translation>
     </message>
     <message>
         <source>Video</source>
@@ -311,184 +319,208 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
         <translation type="obsolete">Votre choix va être enregistré sur le média.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Ne plus demander pour ce média</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Status Batterie</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Mode Sans Echec</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestionnaire Plugin...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Redémarrer Qtopia</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Aide...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>Le niveau de batterie est critique !
+        <translation type="obsolete">Le niveau de batterie est critique !
 Eteigner la machine jusqu&apos;à ça recharge !</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
-        <translation>Battery très faible.</translation>
+        <translation type="obsolete">Battery très faible.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>La niveau de la batterie de sauvegarde est très bas.
+        <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
 Veuillez rechargez la batterie de sauvegarde.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>carte de visite</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Mode Sans Echec</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Une erreur s&apos;est produite lors du démarrage et le système est maintenant en mode sans échec. Les plugins ne sont pas démarrés en mode sans échec. Vous pouvez utiliser le Gestionnaire de Plugin pour désactiver le ou les plugins causant l&apos;erreur.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestionnaire Plugin...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Status Mémoire</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Ressource Mémoire faible
 Sauvegardez vos données.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Ressource Mémoire Critique
 Vous devriez fermer cette
 application immédiatement.</translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation>Terminer</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminer Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Redémarrer</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Redémarrer Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Arrêter</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Ces options sont destinés à être utilisées durant le développement et les tests du système Opie. Dans les conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Arrêt...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Sync Connexion</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus vieille que 1.5.1, vous devriez la mettre à jour.</translation>
+        <translation type="obsolete">&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus vieille que 1.5.1, vous devriez la mettre à jour.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Non authorisé</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous venez juste de démarrer une Synchronisation pour la 1ere fois, c&apos;est normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Authorisé</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Synchronisation en cours</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contacts&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Annuler</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronisé : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/quicklauncher.ts b/i18n/fr/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index aa36bea..bc2825b 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -1,123 +1,268 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Entrer le
 mot de passe</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le
 mot de passe</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entrer mot de passe</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Mot de passe incorrect</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Le mot de passe est incorrect.
 Accès refusé</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Sans</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Entrer le nouveau mot de passe</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Réentrez le mot de passe</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Paramètres de Sécurité</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Changer le
 mot de passe</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Effacer le
 mot de passe</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Demander le mot de passe au démarrage</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronisation</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accepter la synchronisation par réseau de : </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Tous</translation>
+        <translation type="obsolete">Tous</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Aucun</translation>
+        <translation type="obsolete">Aucun</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Ce mot de passe vous permet de protéger l&apos;accès à votre organiseur.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (par défaut)</translation>
+        <translation type="obsolete">192.168.129.0/24 (par défaut)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Mot de Passe</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Nom de connexion</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Connexion Automatique</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/sound.ts b/i18n/fr/sound.ts
index 5316403..5a9db52 100644
--- a/i18n/fr/sound.ts
+++ b/i18n/fr/sound.ts
@@ -81,50 +81,54 @@ Visuelles</translation>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Taux d&apos;échantillonage : </translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Répertoire d&apos;enregistrement : </translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Touche d&apos;enregistrement : </translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Temps d&apos;enreg. max en secondes : </translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sans limite</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Redémarrer Opie si nécessaire</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Key_Record</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index 65c98b4..6191c7d 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -53,104 +53,118 @@
         <source>Application CPU usage (%)</source>
         <translation>Utilisation du processeur par
 les applications (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilisation du processeur par
 le système (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type : </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Cette page montre la charge du processeur.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisée (%1ko)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 ko)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 ko)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libre (%1 ko)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Mémoire Totale : %1 Ko</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Cette page montre l&apos;utilisation de la mémoire par votre PDA.
+        <translation type="obsolete">Cette page montre l&apos;utilisation de la mémoire par votre PDA.
 La mémoire est divisée en catégories comme suit :
 
 1. Utilisée - Mémoire utilisée par Opie et toutes autres applications en cours d&apos;exécution.
 2. Buffers - Mémoire temporaire utilisée pour accroître les performances
 3. Cache - Espace utilisé récemment et non encore libéré.
 4. Libre - Mémoire disponible non encore utilisée par Opie ou par les applications en cours.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Utilisé#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Utilisé par</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Voici la liste de tous les modules chargés sur cet assistant personnel.
 
 Cliquez et maintenez appuyer pour voir les informations à propos du module ou pour le décharger.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Sélectionnez une commande puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer la commande au module sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Cliquez ici pour envoyer la commande sélectionné au module sélectionné.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Cette zone décrit en détail les informations au sujet de ce module.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Voulez-vous vraiment exécuter
 
@@ -185,97 +199,102 @@ Cliquez et maintenez appuyer pour voir les informations à propos du module ou p
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commande</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Etat</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Temps</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Voici la liste de tous les processus en cours sur cet assistant personnel
 
 Cliquez et maintenez appuyer pour voir les informations à propos du processus ou pour lui envoyer un signal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Sélectionnez un signal puis cliquez sur le boutton &quot;Envoyer&quot; pour envoyer le signal au processus sélectionné.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Cliquer ici pour envoyer à ce processus le signal choisi.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Cette zone montre des informations détaillés à propos de ce processus.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Voulez-vous vraiment envoyer
 </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>Vous désirez vraiment envoyer %1 à ce processus ?</translation>
+        <translation type="obsolete">Vous désirez vraiment envoyer %1 à ce processus ?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card: </source>
         <translation type="obsolete">Carte CF:</translation>
     </message>
     <message>
         <source>Hard Disk </source>
         <translation type="obsolete">Disque Dur</translation>
     </message>
     <message>
         <source>SD Card </source>
         <translation type="obsolete">Carte SD</translation>
     </message>
     <message>
         <source>Hard Disk /dev/hd </source>
         <translation type="obsolete">Disque /dev/hd</translation>
     </message>
     <message>
         <source>SCSI Hard Disk /dev/sd </source>
         <translation type="obsolete">Disque SCSI /dev/sd</translation>
     </message>
     <message>
         <source>Int. Storage </source>
         <translation type="obsolete">Stockage int</translation>
     </message>
     <message>
         <source>CF</source>
         <translation type="obsolete">CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation type="obsolete">Ce graphe représente cobien de mémoire est actuellement  utilisée sur cette carte de mémoire CompactFlash.</translation>
     </message>
     <message>
         <source>Ha</source>
         <translation type="obsolete">Ha</translation>
     </message>
     <message>
         <source>This graph represents how much storage is currently used on this hard drive.</source>
         <translation type="obsolete">Ce graphe représente combien de mémoire est actuellement  utilisée sur ce disque.</translation>
     </message>
     <message>
         <source>SD</source>
         <translation type="obsolete">SD</translation>
     </message>
@@ -318,60 +337,68 @@ Cliquez et maintenez appuyer pour voir les informations à propos du processus o
         <source>Memory</source>
         <translation>Memoire</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Stockage</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processus</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Noyau Linux&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilé par : </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Construit le : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Version : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modèle : </translation>
+        <translation type="obsolete">&lt;p&gt;Modèle : </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Fabricant : </translation>
+        <translation type="obsolete">&lt;p&gt;Fabricant : </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Cette page montre la version courante de Opie, du noyau Linux, et de la distribution installés sur cet appareil de poche.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/fr/taboapp.ts b/i18n/fr/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/fr/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/fr/tictac.ts b/i18n/fr/tictac.ts
index 9dd9c4c..9876e27 100644
--- a/i18n/fr/tictac.ts
+++ b/i18n/fr/tictac.ts
@@ -1,49 +1,49 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>TicTac</translation>
+        <translation type="obsolete">TicTac</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>L&apos;ordinateur commence</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>L&apos;humain commence ;)</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Jouer !</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Quitter</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Cliquez sur Jouer pour démarrer</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>A vous de jouer</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Vous avez gagné !</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>L&apos;ordinateur a gagné !</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Match nul</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index bf27afc..27030a7 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -1,55 +1,55 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Aujourd&apos;hui</translation>
+        <translation type="obsolete">Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Propriétaire : </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Entrez vos données personnels</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Aucun module trouvé</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Aucun module activé</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Cliquez ici pour lancer l&apos;application associée</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Aujourd&apos;hui</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Aujourd&apos;hui par Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Cliquez ici pour accéder à la fenêtre de configuration</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today config</source>
         <translation type="obsolete">Config &quot;Aujourd&apos;hui&quot;</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Ordre chargement modules : </translation>
     </message>
     <message>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 98923e8..e9c533e 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -185,97 +185,97 @@ Quit Anyway?</source>
 enregistrer vos modifications.
 Libérez de l&apos;espace et
 réessayez.
 
 Voulez-vous quitter ?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tâche</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Impossible d&apos;éditer les données, synchronization en cours</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation> toutes les tâches ?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation> toutes les tâches effectuées ?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classé</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;%1 nouvelle(s) tâche(s) arrivée(s).&lt;p&gt; Ajouter à votre liste ?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nouvelles Tâches</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliquer</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorité</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Description</translation>
+        <translation type="obsolete">Description</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Echéance</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurer les Modèles</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorité : </translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Donnée en cours de synchronisation, édition impossible</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Donnée en cours de synchronisation, édition impossible</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Editeur de Modèle</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Ajouter</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Effacer</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nouveau Modèle %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
@@ -303,96 +303,100 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
     <message>
         <source>More</source>
         <translation>Plus</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour entrer des informations supplémentaires pour la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Valider</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour ajouter une nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Cliquez ici pour réinitialiser les informations de la nouvelle tâche.
 
 Cette partie est appelé &quot;la barre d&apos;outils&quot;.
 
 Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. Cette partie peut-être affichée ou cachée en selectionnant Option-&gt;&apos;Montrer la barre d&apos;outils&apos; dans le menu ci-dessus.</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vue en Tableau</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucun</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 jour(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nouvelle</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Description : </translation>
diff --git a/i18n/fr/tonleiter.ts b/i18n/fr/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/fr/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/fr/zsafe.ts b/i18n/fr/zsafe.ts
index 24277a6..fd4c621 100644
--- a/i18n/fr/zsafe.ts
+++ b/i18n/fr/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished">ZSafe version 2.1.2&lt;br&gt;</translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information :</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
@@ -246,284 +505,314 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
     </message>
     <message>
         <source>ZSafe version 2.1.0&lt;br&gt;</source>
-        <translation>ZSafe version 2.1.0&lt;br&gt;</translation>
+        <translation type="obsolete">ZSafe version 2.1.0&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find entry</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index 8363e1c..9373605 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -1303,212 +1303,212 @@ ingyenesen elérhető !</translation>
         <source>Kyrgyzstan</source>
         <translation>Kirgizsztán</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palesztín Szuverén Területek</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcaim Szigetek</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnám</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Üzleti telefon</translation>
+        <translation type="obsolete">Üzleti telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Üzleti fax</translation>
+        <translation type="obsolete">Üzleti fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Üzleti mobil</translation>
+        <translation type="obsolete">Üzleti mobil</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Alapértelmezett e-mail</translation>
+        <translation type="obsolete">Alapértelmezett e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>E-mailek</translation>
+        <translation type="obsolete">E-mailek</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Lakás telefon</translation>
+        <translation type="obsolete">Lakás telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Lakás fax</translation>
+        <translation type="obsolete">Lakás fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Lakás mobil</translation>
+        <translation type="obsolete">Lakás mobil</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Iroda</translation>
+        <translation type="obsolete">Iroda</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Szakma</translation>
+        <translation type="obsolete">Szakma</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Titkár</translation>
+        <translation type="obsolete">Titkár</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Manager</translation>
+        <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Hitves</translation>
+        <translation type="obsolete">Hitves</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Nem</translation>
+        <translation type="obsolete">Nem</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Születésnap</translation>
+        <translation type="obsolete">Születésnap</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Évforduló</translation>
+        <translation type="obsolete">Évforduló</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Becenév</translation>
+        <translation type="obsolete">Becenév</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Gyerekek</translation>
+        <translation type="obsolete">Gyerekek</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Megszólítás</translation>
+        <translation type="obsolete">Megszólítás</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Keresztnév</translation>
+        <translation type="obsolete">Keresztnév</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Középső név</translation>
+        <translation type="obsolete">Középső név</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Vezetéknév</translation>
+        <translation type="obsolete">Vezetéknév</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Kiterjesztés</translation>
+        <translation type="obsolete">Kiterjesztés</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Rögzít mint</translation>
+        <translation type="obsolete">Rögzít mint</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Beosztás</translation>
+        <translation type="obsolete">Beosztás</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Részleg</translation>
+        <translation type="obsolete">Részleg</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Cég</translation>
+        <translation type="obsolete">Cég</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Üzleti cím</translation>
+        <translation type="obsolete">Üzleti cím</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Üzleti város</translation>
+        <translation type="obsolete">Üzleti város</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Üzleti állam</translation>
+        <translation type="obsolete">Üzleti állam</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Üzleti irányítószám</translation>
+        <translation type="obsolete">Üzleti irányítószám</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Üzleti ország</translation>
+        <translation type="obsolete">Üzleti ország</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Üzleti személyhívó</translation>
+        <translation type="obsolete">Üzleti személyhívó</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Üzleti weblap</translation>
+        <translation type="obsolete">Üzleti weblap</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Lakás utca</translation>
+        <translation type="obsolete">Lakás utca</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Lakás város</translation>
+        <translation type="obsolete">Lakás város</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Lakás állam</translation>
+        <translation type="obsolete">Lakás állam</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Lakás irányítószám</translation>
+        <translation type="obsolete">Lakás irányítószám</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Lakás ország</translation>
+        <translation type="obsolete">Lakás ország</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Lakás weblap</translation>
+        <translation type="obsolete">Lakás weblap</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Jegyzetek</translation>
+        <translation type="obsolete">Jegyzetek</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index 8a9ac63..532a26c 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -222,96 +222,103 @@ and is licensed by the GPL</source>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index 91976d2..8ed6e41 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -133,109 +133,105 @@ This area allows you to select an application and which settings you wish to dis
         <translation type="unfinished">Fent</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished">Lent</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished">Stílus</translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished">Betű</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished">Színek</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished">Haladó</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished">Újraindít</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Újraindít</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation type="unfinished">Igen</translation>
+        <translation type="obsolete">Igen</translation>
     </message>
     <message>
         <source>No</source>
-        <translation type="unfinished">Nem</translation>
+        <translation type="obsolete">Nem</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">Összeállítás törtlése</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation type="unfinished">Nem tudom a jelenlegi összeállítást törölni.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Összeállítás szerkesztése</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/calculator.ts b/i18n/hu/calculator.ts
index 5d732d0..2b4a1cc 100644
--- a/i18n/hu/calculator.ts
+++ b/i18n/hu/calculator.ts
@@ -80,100 +80,96 @@
     <message>
         <source>x</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
diff --git a/i18n/hu/checkbook.ts b/i18n/hu/checkbook.ts
index b726534..4bf1fcb 100644
--- a/i18n/hu/checkbook.ts
+++ b/i18n/hu/checkbook.ts
@@ -1,505 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</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>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</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>
+    <name>QWidget</name>
     <message>
-        <source>Transaction for </source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Withdrawal</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select date of transaction here.</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number:</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter check number here.</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter description of transaction here.</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select transaction category here.</source>
+        <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>Bills</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>
+        <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
+        <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fee:</source>
+        <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
+        <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information for this transaction here.</source>
+        <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Misc</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Electronics</source>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index be1d212..fc37479 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -105,96 +105,100 @@ Mégis kilép?</translation>
     <message>
         <source>M</source>
         <translation>H</translation>
     </message>
     <message>
         <source>T</source>
         <translation>K / Cs</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Sz</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sz / V</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Hétfő</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Kedd</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Szerde</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Csütörtök</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Péntek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Szombat</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Vasárnap</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vége</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Átsugároz</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -320,96 +324,104 @@ Mégis kilép?</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">Otthon</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ez egy egész napos esemény.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>Jan 00.-Jan 00.</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>H: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Naptár</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Ismétlés...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Napi...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>Heti...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>Havi...</translation>
     </message>
     <message>
         <source>Yearly...</source>
@@ -427,145 +439,145 @@ Mégis kilép?</translation>
         <source>End Time</source>
         <translation>Végső időpont</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Új esemény</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategória</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Találkozó</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ebéd</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Vacsora</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Utazás</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Iroda</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Otthon</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>02 Jan 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Kezdő időpont</translation>
+        <translation type="unfinished">Kezdő időpont</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Egész nap</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Időzóna</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Ébresztő</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>perc</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Csendes</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Hangos</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ismétlés</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nincs ismétlés...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Leírás</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Kezdet - Vég</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Jegyzet...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Kezdő időpont</translation>
+        <translation type="obsolete">Kezdő időpont</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Jegyzet szerkesztése</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ebéd</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Kezdet</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Vég</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Minden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 minden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1-n minden</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1-n minden</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/hu/doctab.ts b/i18n/hu/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/hu/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/filebrowser.ts b/i18n/hu/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/hu/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/gsmtool.ts b/i18n/hu/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/hu/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/kate.ts b/i18n/hu/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/hu/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/launchersettings.ts b/i18n/hu/launchersettings.ts
index 8cdb19d..1214e2e 100644
--- a/i18n/hu/launchersettings.ts
+++ b/i18n/hu/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
@@ -105,104 +159,104 @@
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libclockapplet.ts b/i18n/hu/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/hu/libclockapplet.ts
+++ b/i18n/hu/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/hu/libfreetypefactory.ts b/i18n/hu/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libkeyview.ts b/i18n/hu/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/hu/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libmemoryapplet.ts b/i18n/hu/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/hu/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libmpeg3plugin.ts b/i18n/hu/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/liboapp.ts b/i18n/hu/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libopie.ts b/i18n/hu/libopie.ts
index 505b8b1..f354225 100644
--- a/i18n/hu/libopie.ts
+++ b/i18n/hu/libopie.ts
@@ -16,142 +16,150 @@
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
@@ -363,96 +371,100 @@ and </source>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Nap</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Minden</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Idő:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Válasszon időt:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -579,80 +591,256 @@ and </source>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 %2 of every</source>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libopiecore2.ts b/i18n/hu/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/hu/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libopiedb2.ts b/i18n/hu/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libopiemm2.ts b/i18n/hu/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libopiepim2.ts b/i18n/hu/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libopieui2.ts b/i18n/hu/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libqdasher.ts b/i18n/hu/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/hu/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index 513b137..f1ac981 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -817,109 +817,97 @@ Szabadítson fel némi memóriát és próbálja újra.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Hiba</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Hiba</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokumentum</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kártya</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Merevlemez</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD kártya</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI merevlemez</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Belső tároló</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Belső memória</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC kártya</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/hu/librestartapplet.ts b/i18n/hu/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/libtinykate.ts b/i18n/hu/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/hu/libtinykate.ts
+++ b/i18n/hu/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/hu/libtodayaddressbookplugin.ts b/i18n/hu/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/hu/libtodayaddressbookplugin.ts
+++ b/i18n/hu/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/libtodaydatebookplugin.ts b/i18n/hu/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/hu/libtodaydatebookplugin.ts
+++ b/i18n/hu/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/libtodaytodolistplugin.ts b/i18n/hu/libtodaytodolistplugin.ts
index b423a53..711d14e 100644
--- a/i18n/hu/libtodaytodolistplugin.ts
+++ b/i18n/hu/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/hu/libvtapplet.ts b/i18n/hu/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/hu/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/light-and-power.ts b/i18n/hu/light-and-power.ts
index 29f6e86..56aa033 100644
--- a/i18n/hu/light-and-power.ts
+++ b/i18n/hu/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 lépés</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on AC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/mobilemsg.ts b/i18n/hu/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/hu/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/oipkg.ts b/i18n/hu/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/hu/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/op-qws.ts b/i18n/hu/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/hu/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/opie-login.ts b/i18n/hu/opie-login.ts
index 4c5fbbd..86c7f6b 100644
--- a/i18n/hu/opie-login.ts
+++ b/i18n/hu/opie-login.ts
@@ -7,92 +7,96 @@ accurately to calibrate your screen.</source>
         <translation>A képernyő kalibrálásához érintse
 meg pontosan és határozottan a
 kereszteket a képernyőn.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Üdvözli Önt az Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Belépés</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Az OPIE üdvözli önt&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Felhasználó</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Felfüggeszt</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menü</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Újraindít</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Kilép</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%2 %1&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%2 %1&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Hibás jelszó</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>A megadott jelszó helytelen.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">Az OPIE egy kezeletlen
 jelzés (%1)
 miatt megállt</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Nem sikerült az OPIE-t elindítani.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Nem sikerült átváltani az új felhasználóra</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/opierec.ts b/i18n/hu/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/hu/opierec.ts
+++ b/i18n/hu/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/ordesktop.ts b/i18n/hu/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/osearch.ts b/i18n/hu/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/hu/osearch.ts
+++ b/i18n/hu/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index e44c163..218e360 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Applikáció probléma</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -186,96 +190,100 @@ Kérem töltse fel a biztonsági-elemt.</translation>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Indító</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Indító</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nincs alkalmazás</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Ehhez a dokumentumhoz nincs alkalmazás megadva.&lt;p&gt;Típusa: %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumentumok</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Ikon nézet</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Listanézet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 fájl</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Minden fájltípus</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Dokumentum nézet</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Eszköz betéve</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Hang</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Kép</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Szöveg</translation>
     </message>
     <message>
         <source>Video</source>
@@ -302,181 +310,201 @@ Kérem töltse fel a biztonsági-elemt.</translation>
         <translation type="obsolete">A választása az eszközön lesz tárolva.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Ennél az eszköznél ne kérdezze újra</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Elem állapot</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">Az elem szintje kritikus!
+        <translation type="obsolete">Az elem szintje kritikus!
 Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">A biztonsági-elem szintje nagyon alacsony.
+        <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
 Kérem töltse fel a biztonsági-elemt.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">névjegykártya</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Bezárás</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Opie bezárása</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Újraindít</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Opie újraindítása</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Leállítás</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Ezeka bezárási lehetőségek elsősorban az Opie fejlesztése és tesztelése céljából vannak. Egy normális környezetben ezek feleslegesek.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Mégsem</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Leállítás...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Szinkronizációs kapcsolat</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
+        <translation type="obsolete">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Megtagad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Engedélyez</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Szinkronizálás</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Címlista&lt;b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Mégsem</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/quicklauncher.ts b/i18n/hu/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/security.ts b/i18n/hu/security.ts
index 57461fe..8b69c6f 100644
--- a/i18n/hu/security.ts
+++ b/i18n/hu/security.ts
@@ -1,117 +1,230 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24 (default)</source>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/showimg.ts b/i18n/hu/showimg.ts
index daea628..bfdbdd6 100644
--- a/i18n/hu/showimg.ts
+++ b/i18n/hu/showimg.ts
@@ -103,86 +103,83 @@
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/sound.ts b/i18n/hu/sound.ts
index 559bf2b..34288a5 100644
--- a/i18n/hu/sound.ts
+++ b/i18n/hu/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/sysinfo.ts b/i18n/hu/sysinfo.ts
index 32cdb58..4473f41 100644
--- a/i18n/hu/sysinfo.ts
+++ b/i18n/hu/sysinfo.ts
@@ -50,104 +50,118 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Alkalmazás CPU használat (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Rendszer CPU használat (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Típus:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ez a lap megmutatja, mennyire van az eszköz processzora kihasználva.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Felhasznált (%)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Átmeneti tár (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Gyorsítótár (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Szabad (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Teljes memória: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Ez a lap megmutatja, a memória (azaz RAM) hogyan van felosztva az ön kéziszámítógépében.
+        <translation type="obsolete">Ez a lap megmutatja, a memória (azaz RAM) hogyan van felosztva az ön kéziszámítógépében.
 A memória az alábbiak szerint van kategoruzálva:
 
 1. Felhasznált - az Opie és más futó alkalmazások által felhasznált memória.
 2. Átmeneti tár - ideiglenes tároló a teljesítmény növeléséhez.
 3. Gyorsítótár - nemrég használt, de még fel nem szabadított információk.
 4. Szabad - az Opie vagy más futó alkalmazás által fel nem használt memória.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Méret</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Használat#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Használja</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ez a lista a kernelbe jelenleg betöltött modulokat mutatja.
 
 Bökjön a modul nevére és tartsa, hogy további információkat kapjon a modulról vagy eltávolítsa azt.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Válasszon ki itt egy parancsot és bökjön a jobboldali Küld gombra, hogy a parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Bökjön ide, hogy a kiválasztott parancsot elküldje a fent kiválasztott modulnak.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ez a terület részletes információkat mutat erről a modulról.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Tényleg futtatni akarja
 </translation>
@@ -180,120 +194,129 @@ Bökjön a modul nevére és tartsa, hogy további információkat kapjon a modu
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Parancs</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Állapot</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Idő</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ez kéziszámítógépen futó processzek listája.
 
 Bökjön a processzre és tartsa, hogy további információkat kapjon a processzről, vagy jelzést küldjön annak.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Válasszon egy jelzést itt, majd bökjön a jobboldali Küld gombra, hogy elküldje a processznek.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Küld</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Bökjön ide, hogy elküldje a kiválasztott jelzést ennek a processznek.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ez a terület részletes információkat mutat erről a processzről.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Biztosan küldeni akar
 </translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Rendszer Információ</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Tároló</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processzek</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verzió</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modulok</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Fordította:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Magyar fordítás: Czakó Krisztián (slapic@linux.co.hu)
 &lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Készült:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Verzió:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modell:</translation>
+        <translation type="obsolete">&lt;p&gt;Modell:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Gyártó:</translation>
+        <translation type="obsolete">&lt;p&gt;Gyártó:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Ez a lap mutatja a gépen futó Opie, a Linux Kernel és a disztribúció verzióit.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/hu/taboapp.ts b/i18n/hu/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/hu/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/hu/tictac.ts b/i18n/hu/tictac.ts
index f8eccb8..1e4a751 100644
--- a/i18n/hu/tictac.ts
+++ b/i18n/hu/tictac.ts
@@ -1,48 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index 31646ac..cbaf94b 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Ma</translation>
+        <translation type="obsolete">Ma</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Tulajdonos:</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Kérem töltse ki a névjegyét</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Nem találtam kiegészítőt</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nincs aktivált kiegészítő</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Bökjön ide a hozzárendelt program indításához</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Ma</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Készítette Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Bökjön ide a beállításhoz</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Mely kiegészítő milyen sorrendben töltödjön be:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Mozgasd fel</translation>
     </message>
     <message>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index 806bcc7..8eb0808 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -177,97 +177,97 @@ Quit Anyway?</source>
 a változásokat.
 Szabaditson fel némi helyet
 és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Teendők</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Az adat nem szerkeszthető, szinkronizáció folyamatban</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation type="unfinished">minden feladat?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation type="unfinished">minden elvégzett feladat?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Iktatatlan</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">&lt;P&gt;%1 új feladat érkezett.&lt;p&gt;Szeretné hozzáadni a Teendőkhöz?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished">Új feladatok</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Dupláz</translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished">T.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished">Fontosság</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Leírás</translation>
+        <translation type="obsolete">Leírás</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Határidő</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished">Sablonok beállítása</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished">Fontosság:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished">Sablon szerkesztő</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">Hozzáad</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Szerkeszt</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished">Eltávolít</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">Név</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished">új sablon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide az új feladat fontosságának beállításához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
@@ -295,96 +295,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide, hogy beírjon kiegészítő információkat az új feladathoz.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished">Bevisz</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide új feladat hozzáadásához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Mégsem</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished">Bökjön ide az új feladat információk alaphelyzetbe hozásához.
 
 Ezt a területet gyors feladatcsíknak hívjuk.
 
 Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terület mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a gyors feladatcsíkot&apos; menüből.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tábla nézet</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nincs</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 nap</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Új</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Szerkeszt</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Töröl</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Leírás:</translation>
diff --git a/i18n/hu/tonleiter.ts b/i18n/hu/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/hu/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/hu/zsafe.ts b/i18n/hu/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/hu/zsafe.ts
+++ b/i18n/hu/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index 24ae164..59c86f6 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -1304,212 +1304,212 @@ rilasciato gratuitamente!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestinian Sovereign Areas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Isole Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Premi pre inserire cognome e nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Inserisci il nome completo direttamente ! Se hai un cognome con più parole (per esempio &quot;di Filippo&quot;), scrivi per favore &lt;cognome&gt;,&lt;nomi&gt; come: &quot;di Filippo, Francesco&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Titolo..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Qualcosa come &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Il posto di lavoro del contatto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Premi per selezionare l&apos;attributo da cambiare</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Premi per selezionare come registrare il nome (e come visualizzarlo nella vista)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Tel. Lavoro</translation>
+        <translation type="obsolete">Tel. Lavoro</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax Lavoro</translation>
+        <translation type="obsolete">Fax Lavoro</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Cell. Lavoro</translation>
+        <translation type="obsolete">Cell. Lavoro</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Email Principale</translation>
+        <translation type="obsolete">Email Principale</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Altre Email</translation>
+        <translation type="obsolete">Altre Email</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Tel. Abitazione</translation>
+        <translation type="obsolete">Tel. Abitazione</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax Abitazione</translation>
+        <translation type="obsolete">Fax Abitazione</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Cell. Abitazione</translation>
+        <translation type="obsolete">Cell. Abitazione</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Lavoro</translation>
+        <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Professione</translation>
+        <translation type="obsolete">Professione</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistente</translation>
+        <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Direttore</translation>
+        <translation type="obsolete">Direttore</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Coniuge</translation>
+        <translation type="obsolete">Coniuge</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sesso</translation>
+        <translation type="obsolete">Sesso</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Compleanno</translation>
+        <translation type="obsolete">Compleanno</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Anniversario</translation>
+        <translation type="obsolete">Anniversario</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Alias</translation>
+        <translation type="obsolete">Alias</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Figli</translation>
+        <translation type="obsolete">Figli</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titolo</translation>
+        <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Secondo Nome</translation>
+        <translation type="obsolete">Secondo Nome</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Cognome</translation>
+        <translation type="obsolete">Cognome</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Suffisso</translation>
+        <translation type="obsolete">Suffisso</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Visualizza come</translation>
+        <translation type="obsolete">Visualizza come</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Titolo</translation>
+        <translation type="obsolete">Titolo</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Dipartimento</translation>
+        <translation type="obsolete">Dipartimento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Società</translation>
+        <translation type="obsolete">Società</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Indirizzo Lavoro</translation>
+        <translation type="obsolete">Indirizzo Lavoro</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Città Lavoro</translation>
+        <translation type="obsolete">Città Lavoro</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Stato Lavoro</translation>
+        <translation type="obsolete">Stato Lavoro</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>CAP Lavoro</translation>
+        <translation type="obsolete">CAP Lavoro</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Paese Lavoro</translation>
+        <translation type="obsolete">Paese Lavoro</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Cercapersone Lavoro</translation>
+        <translation type="obsolete">Cercapersone Lavoro</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Pagina Web Lavoro</translation>
+        <translation type="obsolete">Pagina Web Lavoro</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Indirizzo Abitazione</translation>
+        <translation type="obsolete">Indirizzo Abitazione</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Città Abitazione</translation>
+        <translation type="obsolete">Città Abitazione</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Stato Abitazione</translation>
+        <translation type="obsolete">Stato Abitazione</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>CAP Abitazione</translation>
+        <translation type="obsolete">CAP Abitazione</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Paese Abitazione</translation>
+        <translation type="obsolete">Paese Abitazione</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Pagina Web Abitazione</translation>
+        <translation type="obsolete">Pagina Web Abitazione</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Note</translation>
+        <translation type="obsolete">Note</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index ac14e2f..d5fc160 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -245,96 +245,103 @@ Vuoi veramente eliminarlo?</translation>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>Impossibile rimuovere la directory corrente
 dai bookmark.
 Non è inserita nei bookmark!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Cerca File</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>Vuoi veramente eliminare %1
 e tutto il suo contenuto ?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>Vuoi veramente eliminare
 %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Salva output su file (solo nome)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Output</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Il processo non può essere iniziato</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Errore
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Terminato
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Imposta Permessi File</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Imposta permessi file per:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>proprietario</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppo</translation>
     </message>
diff --git a/i18n/it/appearance.ts b/i18n/it/appearance.ts
index a9f58b5..0f82f2d 100644
--- a/i18n/it/appearance.ts
+++ b/i18n/it/appearance.ts
@@ -149,109 +149,109 @@ Quest&apos;area permette di selezionare un&apos;applicazione e quali impostazion
         <translation>In Alto</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Premi qui per far apparire i tab in cima alla finestra.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>In Basso</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Premi qui per far apparire i tab in fondo alla finestra.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Direzione rotazione:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Impostazioni Aspetto</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Questa è un&apos;anteprima.  Controlla qui il nuovo aspetto una volta modificate le opzioni.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stile</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Finestre</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Riavvia</translation>
+        <translation type="obsolete">Riavvia</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Vuoi riavviare %1 ora?</translation>
+        <translation type="obsolete">Vuoi riavviare %1 ora?</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>Save Scheme</source>
         <translation>Salva Schema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Salva schema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Schema già esistente.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Cancella schema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Impossibile cancellare schema corrente.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nuovo&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Modifica schema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Premi qui per selezionare un colore per: </translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Esempio</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Elemento Normale</translation>
     </message>
     <message>
diff --git a/i18n/it/calculator.ts b/i18n/it/calculator.ts
index 57ec42e..b0d2d7d 100644
--- a/i18n/it/calculator.ts
+++ b/i18n/it/calculator.ts
@@ -85,97 +85,97 @@
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
     <message>
         <source>Calculator</source>
-        <translation>Calcolatrice</translation>
+        <translation type="obsolete">Calcolatrice</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Standard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index f715e71..71e1714 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -1,525 +1,755 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nuova nota spese</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informazioni</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Movimenti</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafici</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Inserisci qui il nome della nota spese.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Seleziona qui il tipo di nota spese.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Risparmio</translation>
+        <translation type="obsolete">Risparmio</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Deposito</translation>
+        <translation type="obsolete">Deposito</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Mercato finanziario</translation>
+        <translation type="obsolete">Mercato finanziario</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Mutuo</translation>
+        <translation type="obsolete">Mutuo</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Altro</translation>
+        <translation type="obsolete">Altro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banca:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Inserisci qui il nome della banca per questa nota spese.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Numero conto:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Inserisci qui il numero di conto per questa nota spese.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numero PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Inserisci qui il numero PIN per questa nota spese.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo iniziale:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Inserisci qui il saldo iniziale per questa nota spese.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Inserisci qui ulteriori informazioni necessarie per questa nota spese.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Saldo: %10.00</translation>
+        <translation type="obsolete">Saldo: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Quest&apos;area mostra l&apos;attuale saldo per questa nota spese.</translation>
+        <translation type="obsolete">Quest&apos;area mostra l&apos;attuale saldo per questa nota spese.</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>Questa è una lista di tutti i movimenti inseriti per questa nota spese.
 
 Per ordinarla per un campo specifico, Premi sul nome della colonna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Importo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Premi qui per aggiungere un nuovo movimento.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Seleziona un movimento e Premi qui per modificarlo.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleziona una nota spese e Premi qui per eliminarla.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleziona il grafico desiderato e Premi sul pulsante Disegna.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Premi qui per selezionare il tipo di grafico desiderato.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo del conto</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Prelievi per categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depositi per categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Disegna</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Premi qui per disegnare il grafico selezionato.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Saldo: %1%2</translation>
+        <translation type="obsolete">Saldo: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Elimina movimento</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Protetta da password</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Premi qui per abilitare/disabilitare la protezione con password per questa nota spese.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Conferma password</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prego conferma la tua password:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prego inserisci la tua password per confermare l&apos;eliminazione della protezione con password:</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Saldo</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configura Nota Spese</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Inserisci simbolo valuta:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Inserisci qui il tuo simbolo valuta.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra quando una nota spese è protetta
 da password</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>Premi qui per selezionare se nella finestra principale verrà o no mostrato se la nota spese è protetta da password.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostra i saldi delle note spese</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Premi qui per selezionare se nella finestra principale verranno o no mostrati i saldi di ogni nota spese.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Elimina</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Nota Spese</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Premi per creare una nuova nota spese.
 
 Puoi anche selezionare Nuova dal menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</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>Seleziona una nota spese e Premi qui per modificarla.
 
 Puoi anche selezionare Modifica dal menu, o Premi e tieni premuto sul nome della nota spese.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Seleziona un movimento e Premi qui per eliminarlo.
 
 Puoi anche selezionare Elimina dal menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Questa è la lista di tutte le note spese attualmente disponibili.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Elimina nota spese</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configura</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Premi qui per configurare questa applicazione.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome Nota Spese</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prego inserisci la tua password:</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Modifica</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Elimina</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Risparmio</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Deposito</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Mercato finanziario</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Mutuo</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Altro</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Automobile</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Conti</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Vestiti</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Computer</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVD</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Elettronica</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Intrattenimento</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Cibo</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Carburante</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Varie</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Film</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Affitto</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Viaggio</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Lavoro</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Parente</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Spese Varie</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Movimento per </translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Prelievo</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleziona qui se il movimento è un prelievo o un deposito.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Deposito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleziona qui la data del movimento.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numero:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Inserisci qui il numero del conto.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrizione:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Inserisci qui la descrizione del movimento.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleziona qui la categoria del movimento.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleziona qui il tipo di movimento.
 
 Le opzioni disponibili variano a seconda se il movimento è un deposito o un prelievo.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Importo:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Inserisci qui l&apos;importo del movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Tassa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Inserisci ogni tassa associata a questo movimento.
 
 Il valore inserito deve essere sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Note:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Inserisci qui ogni altra informazione per questo movimento.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Automobile</translation>
+        <translation type="obsolete">Automobile</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Conti</translation>
+        <translation type="obsolete">Conti</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Vestiti</translation>
+        <translation type="obsolete">Vestiti</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Computer</translation>
+        <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVD</translation>
+        <translation type="obsolete">DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elettronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Intrattenimento</translation>
+        <translation type="obsolete">Intrattenimento</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Cibo</translation>
+        <translation type="obsolete">Cibo</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Carburante</translation>
+        <translation type="obsolete">Carburante</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Varie</translation>
+        <translation type="obsolete">Varie</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Film</translation>
+        <translation type="obsolete">Film</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Affitto</translation>
+        <translation type="obsolete">Affitto</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viaggio</translation>
+        <translation type="obsolete">Viaggio</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Debito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Assegno</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Trasferimento</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Carta di Credito</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Lavoro</translation>
+        <translation type="obsolete">Lavoro</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Parente</translation>
+        <translation type="obsolete">Parente</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Spese Varie</translation>
+        <translation type="obsolete">Spese Varie</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pagamento Automatico</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Contante</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Elettronica</translation>
+        <translation type="obsolete">Elettronica</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index 84a8f8d..552ee9d 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -106,96 +106,100 @@ Uscire comunque?</translation>
     <message>
         <source>M</source>
         <translation>L</translation>
     </message>
     <message>
         <source>T</source>
         <translation>M</translation>
     </message>
     <message>
         <source>W</source>
         <translation>M</translation>
     </message>
     <message>
         <source>F</source>
         <translation>V</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Mercoledì</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Giovedì</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Venerdì</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sabato</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domenica</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Trasmetti via IrDA</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Orario</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Copia</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -325,97 +329,97 @@ Uscire comunque?</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Predefiniti</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Questo è un evento per tutto il giorno.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Gen-00. Gen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">LMMGVSDL</translation>
+        <translation type="unfinished">LMMGVSDL</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Lun</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Mar</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Mer</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Gio</translation>
     </message>
     <message>
         <source>Fr</source>
@@ -479,137 +483,137 @@ Uscire comunque?</translation>
         <translation>Nuovo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ubicazione</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Appuntamento</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Pranzo</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Cena</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viaggio</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrizione</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Inizio - Fine </translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Gen 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Ora inizio</translation>
+        <translation type="unfinished">Ora inizio</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Tutto il giorno</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso orario</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Allarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minuti</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Basso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ripetuto</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Non Ripetere...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Note...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Inizio</translation>
+        <translation type="obsolete">Inizio</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Modifica Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Pranzo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fine</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 ogni </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Il %1 ogni </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Il %1 %1 di ogni</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/it/doctab.ts b/i18n/it/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/it/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/filebrowser.ts b/i18n/it/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/it/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/gsmtool.ts b/i18n/it/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/it/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/kate.ts b/i18n/it/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/it/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/kpacman.ts b/i18n/it/kpacman.ts
index 4ddce63..3622838 100644
--- a/i18n/it/kpacman.ts
+++ b/i18n/it/kpacman.ts
@@ -177,67 +177,71 @@ oppure è in un formato sconosciuto.</translation>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation></translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>PREMI CURSORE PER INIZIARE</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>  1UP </translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>PUTEGGIO</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>  2UP </translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>     CONGRATULAZIONI      </translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    SEI ARRIVATO   </translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>  UN PUTEGGIO NEI PRIMI 10.  </translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>LIV   PUNT.  NOME   DATA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUSA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Il pixmap non può essere costruito.
 
 Il file &apos;@PIXMAPNAME@&apos; non esiste,
 oppure è in un formato sconosciuto.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Errore di Inizializzazione</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/launchersettings.ts b/i18n/it/launchersettings.ts
index 5d81890..054082a 100644
--- a/i18n/it/launchersettings.ts
+++ b/i18n/it/launchersettings.ts
@@ -1,87 +1,141 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Impostazioni Launcher</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taskbar</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tab</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Carica applet nel O-Menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostra tab del Launcher nel O-Menu</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Controlla le applet che vuoi inserite nel O-Menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Aggiungi i contenuti dei Tab del Launcher come menu nel O-Menu.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Esempio 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Esempio 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Esempio 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Modifica Tab</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Sfondo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Font</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icone</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Anteprima %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Questa è un&apos;anteprima di come verrà visualizzato il Tab selezionato.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usa un font personalizzato</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -107,103 +161,111 @@
         <source>Default</source>
         <translation>Predefinito</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Dimensione:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Piccolo</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Colore:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher Tab:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Abilita indicatore occupato grande</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Abilita indicatore occupato lampeggiante</translation>
+        <translation type="obsolete">Abilita indicatore occupato lampeggiante</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleziona il Launcher Tab che vuoi modificare o eliminare.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Aggiungi un nuovo Tab al Launcher.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Apri una nuova finestra per personalizzare il Tab selezionato.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Elimina un Tab dal Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Attiva questo, se vuoi un indicatore di occupato grande al centro dello schermo invece di quello nella taskbar.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Attiva questo, se vuoi un indicatore di occupato lampeggiante per far partire le applicazioni nel Launcher.</translation>
+        <translation type="obsolete">Attiva questo, se vuoi un indicatore di occupato lampeggiante per far partire le applicazioni nel Launcher.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Tutti i Tab</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Ancora non implementato</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Carica applet nella Taskbar</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Controlla le applet che vuoi visualizzate nella Taskbar.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libclockapplet.ts b/i18n/it/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/it/libclockapplet.ts
+++ b/i18n/it/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/it/libfreetypefactory.ts b/i18n/it/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libkeyview.ts b/i18n/it/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/it/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libliquid.ts b/i18n/it/libliquid.ts
index 071946e..4fa8cd2 100644
--- a/i18n/it/libliquid.ts
+++ b/i18n/it/libliquid.ts
@@ -1,76 +1,76 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Stile Liquid</translation>
+        <translation type="unfinished">Stile Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>No trasparenza</translation>
+        <translation type="unfinished">No trasparenza</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Colore sfondo</translation>
+        <translation type="unfinished">Colore sfondo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Colore pulsante</translation>
+        <translation type="unfinished">Colore pulsante</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Colore sfondo trasparente</translation>
+        <translation type="unfinished">Colore sfondo trasparente</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Colore pulsante trasparente</translation>
+        <translation type="unfinished">Colore pulsante trasparente</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Trasparenza personalizzata</translation>
+        <translation type="unfinished">Trasparenza personalizzata</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Colore menu</translation>
+        <translation type="unfinished">Colore menu</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Colore testo</translation>
+        <translation type="unfinished">Colore testo</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacità</translation>
+        <translation type="unfinished">Opacità</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usa testo menu ombreggiato</translation>
+        <translation type="unfinished">Usa testo menu ombreggiato</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Pulsanti barra applicazioni senza rilievo</translation>
+        <translation type="unfinished">Pulsanti barra applicazioni senza rilievo</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Contrasto</translation>
+        <translation type="unfinished">Contrasto</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Stile Liquid ad alte performance di Mosfet</translation>
+        <translation type="unfinished">Stile Liquid ad alte performance di Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libmemoryapplet.ts b/i18n/it/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/it/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libmpeg3plugin.ts b/i18n/it/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/liboapp.ts b/i18n/it/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libopie.ts b/i18n/it/libopie.ts
index e920867..294865d 100644
--- a/i18n/it/libopie.ts
+++ b/i18n/it/libopie.ts
@@ -17,141 +17,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Pulsante Posta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Pulsante Home</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Pulsante Registrazione</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Rotazione Display</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Basso+Sù</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Basso+Giù</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Basso+Destra</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Basso+Sinistra</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Alto+Sù</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Alto+Giù</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Alto+Destra</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Alto+Sinistra</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Tinta:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rosso:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Blu:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Alpha channel:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Seleziona colore</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Ancora</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Ancora...</translation>
+        <translation type="obsolete">Ancora...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>FileDialog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
@@ -365,102 +377,106 @@ e </translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>settimana(e)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Ripeti Per</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Giorno</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Ogni</translation>
     </message>
     <message>
         <source>on </source>
         <translation>su</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Orario:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Scegli l&apos;Orario:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">Descrizione:</translation>
+        <translation type="unfinished">Descrizione:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorità:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Avanzamento:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Scadenza:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefono Casa: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Casa: </translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Cellulare Casa: </translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Pagina Web Casa: </translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Pagina Web Ufficio: </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Ufficio: </translation>
@@ -598,79 +614,259 @@ e </translation>
         <translation>Domenica</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>File</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Tutti i File</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Molto alta</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alta</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normale</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bassa</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Molto bassa</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Ubicazione:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Evento per tutto il giorno</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Evento per molti giorni</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Ufficio:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Indirizzo Casa:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Il %1 %2 di ogni</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>°</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>°</translation>
     </message>
     <message>
         <source>th</source>
         <translation>°</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopiecore2.ts b/i18n/it/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/it/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libopiedb2.ts b/i18n/it/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libopiemm2.ts b/i18n/it/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libopiepim2.ts b/i18n/it/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libopieui2.ts b/i18n/it/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libqdasher.ts b/i18n/it/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/it/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index cc127c1..fe3ab53 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -820,109 +820,97 @@ riprovare.</translation>
         <translation>Gen</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mag</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Giu</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Lug</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Errore</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Errore</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Card CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Hard Disk</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Card SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Hard Disk SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memoria Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Card MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/it/librestartapplet.ts b/i18n/it/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/libtinykate.ts b/i18n/it/libtinykate.ts
index 6d864e5..f0a6b17 100644
--- a/i18n/it/libtinykate.ts
+++ b/i18n/it/libtinykate.ts
@@ -1,24 +1,977 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Si è verificato un error nella creazione
 nel file di configurazione 
 per questo programma.
 
 Liberare dello spazio e
 ritentare.</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/it/libtodayaddressbookplugin.ts b/i18n/it/libtodayaddressbookplugin.ts
index 4bff3b4..a79a5de 100644
--- a/i18n/it/libtodayaddressbookplugin.ts
+++ b/i18n/it/libtodayaddressbookplugin.ts
@@ -1,95 +1,115 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Max Linee: </translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Inserisci il numero massimo di righe che dovranno essere visualizzate per ogni anniversario/compleanno</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Unisci riga dopo X caratteri: </translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Dopo quanti caratteri le informazioni sull&apos;impegno non devono essere visualizzate</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Giorni da guardare avanti: </translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Per quanti giorni in avanti dobbiamo cercare</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Per attivare le impostazioni: Riavvia l&apos;applicazione !</translation>
+        <translation type="unfinished">Per attivare le impostazioni: Riavvia l&apos;applicazione !</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Imposta Colore Titolo: </translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>I colori per i titoli !</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Imposta Colore Impegno: </translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Questo colore sarà utilizzato per visualizzare i compleanni/annversari !</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Imposta Colore
 &quot;Urgente&quot; sotto </translation>
     </message>
     <message>
         <source> days: </source>
         <translation> giorni: </translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Questo colore verrà utilizzato se siamo vicino all&apos;evento !</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Questo colore verrà utilizzato se il compleanno/anniversario è più vicino dei giorni dati !</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Plugin Rubrica</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prossimi compleanni in &lt;b&gt; %1 &lt;/b&gt; giorni:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nessun compleanno in &lt;b&gt; %1 &lt;/b&gt; giorni!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Prossimi anniversari in &lt;b&gt; %1 &lt;/b&gt; giorni:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nessun anniversario in &lt;b&gt; %1 &lt;/b&gt; giorni!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Il database non prevede questo tipo di ricerca ! Aggiorna libOpie !&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libvtapplet.ts b/i18n/it/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/it/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/light-and-power.ts b/i18n/it/light-and-power.ts
index 52e96cd..fbbac1e 100644
--- a/i18n/it/light-and-power.ts
+++ b/i18n/it/light-and-power.ts
@@ -1,58 +1,65 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 Intervalli</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation>Risparmio Energetico</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Mentre è in uso il dispositivo, la luminosità dello schermo può essere adattata automaticamente rilevando l&apos;intesità della luce ambientale. La regolazione della luminosità influisce comunque sulla luminosità media.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Riduci dopo</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Sospendi dopo</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Spegni dopo</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Spenta</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>con Batteria</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Impostazioni Generali</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>mai</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Disattiva solo LCD (non sospendere)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Retroilluminazione</translation>
@@ -68,85 +75,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation>Usa Sensore Luminoso</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Tara</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Impostazioni avanzate per sensore luminoso</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>con AC</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Avvisi</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Intervalli livello critico ogni</translation>
     </message>
     <message>
         <source> %</source>
         <translation> %</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>A che livello di carica della batteria l&apos;avviso di livello basso deve essere inviato</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>Quanto spesso bisogna controllare il livello di carica della batteria. Questo determina quanto spesso l&apos;avviso di livello basso deve essere inviato</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>A che livello di carica della batteria l&apos;avviso di livello critico deve essere inviato</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>livello molto basso al</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>livello critico al</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Taratura Sensore</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Intensa</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Spento</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Scuro</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Chiaro</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Intervalli</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Intervallo di controllo</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> sec</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/mobilemsg.ts b/i18n/it/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/it/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/oipkg.ts b/i18n/it/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/it/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/op-qws.ts b/i18n/it/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/it/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/opie-login.ts b/i18n/it/opie-login.ts
index 33107b1..a64cc19 100644
--- a/i18n/it/opie-login.ts
+++ b/i18n/it/opie-login.ts
@@ -7,95 +7,99 @@
 accurately to calibrate your screen.</source>
         <translation>Tocca le croci accuratamente e
 con fermezza per tarare lo schermo.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Benvenuto in Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Autenticazione</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Benvenuto in OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utente</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Sospendi</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Riavvia</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>La password inserita non è corretta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">OPIE è stato terminato
 da un segnale
 (%1)
 </translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Impossibile inizializzare OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Impossibile cambiare utente</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie è stato terminato
 da un segnale
 (%1)</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Impossibile inizializzare Opie.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/opierec.ts b/i18n/it/opierec.ts
index 3d4ad68..7d012ad 100644
--- a/i18n/it/opierec.ts
+++ b/i18n/it/opierec.ts
@@ -154,60 +154,68 @@ il file selezionato?</translation>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Impossibile aprire il file audio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Riproduci</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Invia con Ir</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Rinomina</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Invia via Ir</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Invio Ir effettuato.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Registra</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Ubicazione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compressione (file più piccoli)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>Mute automatico</translation>
+        <translation type="obsolete">Mute automatico</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>mute</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/ordesktop.ts b/i18n/it/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/osearch.ts b/i18n/it/osearch.ts
index 0c44637..75192e1 100644
--- a/i18n/it/osearch.ts
+++ b/i18n/it/osearch.ts
@@ -13,96 +13,100 @@
     <message>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenti</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Attività</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Cerca</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Cerca tutto</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Cse sensitive</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Usa wildcards</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Inserisci qui i termini di ricerca</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Risultati</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
         <translation>mostra attività terminate</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>mostra eventi passati</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>cerca nei giorni</translation>
     </message>
     <message>
         <source>show</source>
         <translation>mostra</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>modifica</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>esegui</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>aprin nel filemanager</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>File: </translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Link: </translation>
     </message>
     <message>
         <source>Mimetype: </source>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index 412401b..cb2850d 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -1,64 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problema Applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -195,96 +199,100 @@ Cambiarla subito.</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Nessuna applicazione</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Nessuna applicazione è definita per questo documento.&lt;p&gt;Il tipo è %1.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Ricerca documenti</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documenti</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Mostra Icone</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Mostra Lista</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 file</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Tutti i tipi di file</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Mostra Documento</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Supporto inserito</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Immagine</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Testo</translation>
     </message>
     <message>
         <source>Video</source>
@@ -311,181 +319,201 @@ Cambiarla subito.</translation>
         <translation type="obsolete">La tua scelta verrà inserita sul supporto.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Non chiedere nuovamente per questo supporto</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Stato Batteria</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">Il livello della batteria è critico!
+        <translation type="obsolete">Il livello della batteria è critico!
 Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">La batteria di Back-up si sta scaricando.
+        <translation type="obsolete">La batteria di Back-up si sta scaricando.
 Cambiarla subito.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">biglietto da visita</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Chiudi</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Chiudi Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Riavvia</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Riavvia Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Sospendi</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Queste opzioni di chiusura sono state inserite principalmente per sviluppo e test di Opie. Per un uso normale, queste opzioni non sono necessarie.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Sospendi...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Sync Connessione</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
+        <translation type="obsolete">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Nega</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permetti</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizzazione</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contatti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancella</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/quicklauncher.ts b/i18n/it/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index 22ab5fa..fa75b9a 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -1,119 +1,264 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Imposta password</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Inserisci password</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Password errata</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>La password inserita è sbagliata.
 Accesso negato</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Tutti</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuno</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Inserisci nuova password</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Rinserisci nuova password</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Impostazioni Sicurezza</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Cambia password</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Cancella password</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Richiedi password all&apos;avvio</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accetta sync dalla rete:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (predefinita)</translation>
+        <translation type="obsolete">192.168.129.0/24 (predefinita)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Tutte</translation>
+        <translation type="obsolete">Tutte</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nessuna</translation>
+        <translation type="obsolete">Nessuna</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Password</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Login Automatico</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/showimg.ts b/i18n/it/showimg.ts
index 6449565..8ebaf7f 100644
--- a/i18n/it/showimg.ts
+++ b/i18n/it/showimg.ts
@@ -104,86 +104,83 @@
         <source> True color</source>
         <translation> True color</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha levels</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha channel</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>Slide show</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>Fine Slideshow</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Slide Show</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Ritardo tra le immagini</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Ripeti slideshow</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Mostra immagini in negativo</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Carica immagini ruotate a 90 gradi</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Caricamento veloce immagini</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/sound.ts b/i18n/it/sound.ts
index 769911d..9985fb1 100644
--- a/i18n/it/sound.ts
+++ b/i18n/it/sound.ts
@@ -80,50 +80,54 @@
     <message>
         <source>Key_Calender</source>
         <translation>Key_Calender</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Key_Contacts</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Key_Menu</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Key_Mail</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Limite di Registrazione in secondi:</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Illimitato</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Riavvia Opie se necessario</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/sysinfo.ts b/i18n/it/sysinfo.ts
index 548e291..85445c3 100644
--- a/i18n/it/sysinfo.ts
+++ b/i18n/it/sysinfo.ts
@@ -51,104 +51,118 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Utilizzo CPU applicazione (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Utilizzo CPU sistema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Questa pagina mostra quanto è utilizzato il processore di questo dispositivo.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usata (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffer (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cached (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Libera (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memoria Totale: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Questa pagina mostra quanta memoria (es. RAM) è stata allocata su questo dispositivo portatile.
+        <translation type="obsolete">Questa pagina mostra quanta memoria (es. RAM) è stata allocata su questo dispositivo portatile.
 La memoria è divisa come segue:
 
 1. Usata - memoria utilizzata da Opie e da qualunque altra applicazione in esecuzione.
 2. Buffer - spazio temporaneo utilizzato per aumentare le prestazioni
 3. Cached - informazioni che sono state utilizzate recentemente, ma che non sono ancora state liberate.
 4. Libera - memoria non ancora utilizzata da Opie o da qualunque altra applicazione.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Usato Da</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Questa è una lista di tutti i moduli del kernel attualmente caricati su questo dispositivo portatile.
 
 Tenere premuto sul nome di un modulo per vedere ulteriori informazioni, o per scaricarlo.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selezionare qui un comando e premere il pulsante Invia sulla destra per inviare il comando al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Premere qui per inviare il comando selezionato al modulo sopra evidenziato.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo modulo.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Vuoi veramente eseguire
 </translation>
@@ -182,118 +196,131 @@ Tenere premuto sul nome di un modulo per vedere ulteriori informazioni, o per sc
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Stato</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Questo è l&apos;elenco di tutti i processi su questo dispositivo portatile.
 
 Tenere premuto sul nome di un processo per vedere ulteriori informazioni, o per inviargli un segnale.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Selezionare qui un segnale e premere il pulsante Invia sulla destra per inviarlo al processo.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Invia</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Premere qui per inviare il segnale selezionato a questo processo.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Quest&apos;area mostra informazioni dettagliate su questo processo.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Vuoi veramente inviare
 </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>Inviare veramente %1 a questo processo?</translation>
+        <translation type="obsolete">Inviare veramente %1 a questo processo?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoria</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Storage</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processi</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel Linux&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilato da: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilato il: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versione: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modello: </translation>
+        <translation type="obsolete">&lt;p&gt;Modello: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Produttore: </translation>
+        <translation type="obsolete">&lt;p&gt;Produttore: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Questa pagina mostra le versioni correnti di Opie, del kernel di Linux e della distribuzione in esecuzione su questo dispositivo portatile.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/it/taboapp.ts b/i18n/it/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/it/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/it/tictac.ts b/i18n/it/tictac.ts
index 573ba68..ab167a4 100644
--- a/i18n/it/tictac.ts
+++ b/i18n/it/tictac.ts
@@ -1,49 +1,49 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>TicTac</translation>
+        <translation type="obsolete">TicTac</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Inizia computer</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Inizia umano</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Gioca!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Esci</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Premere Gioca per iniziare</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Fai la tua mossa</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Hai vinto!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Il Computer ha vinto!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Pareggio</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index 0602b3f..16d8fc4 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -1,55 +1,55 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Oggi</translation>
+        <translation type="obsolete">Oggi</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Proprietà di</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Inserisci i tuoi dati personali</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Nessun plugin trovato</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Nessun plugin attivato</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Premi qui per lanciare l&apos;app. associata</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Oggi</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Oggi by Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Premi qui per andare alle impostazioni</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Carica i plugin nell&apos;ordine:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Muovi Sù</translation>
     </message>
     <message>
diff --git a/i18n/it/todolist.ts b/i18n/it/todolist.ts
index 92bd327..d9c6d6a 100644
--- a/i18n/it/todolist.ts
+++ b/i18n/it/todolist.ts
@@ -172,97 +172,97 @@ Vengono elencate le seguenti informazioni:
         <translation>Vuota</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio esaurito</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Impossibile salvare le modifiche.
 Liberare dello spazio e ritentare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Attività</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>tutte le attività?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>tutte le attività completate?</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;%1 nuove attività ricevute.&lt;p&gt;Vuoi aggiungerle alle tue Attività?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nuove Attività</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorità</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrizione</translation>
+        <translation type="obsolete">Descrizione</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Scadenza</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Modifica Modelli</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Editor Modelli</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Elimina</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nuovo Modello %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Premi qui per impostare la priorità della nuova attività.
     
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
@@ -290,96 +290,100 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Premi qui per aggiungere una nuova attività.
 
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Premi qui per cancellare le informazioni sulla nuova attività.
 
 Quest&apos;area è chiamata &quot;quick task bar&quot;.
 
 Ti permette di aggiungere velocemente una nuova attività.  Quest&apos;area può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra quick task bar&apos; dal menù in alto.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorità:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Dati non modificabili, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Dati non modificabili, sincronizzazione in corso</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Mostra Tabella</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 giorno(i)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nessuna</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Ora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nuova</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Modifica</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Elimina</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Summary:</source>
         <translation>Sommario:</translation>
diff --git a/i18n/it/tonleiter.ts b/i18n/it/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/it/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/it/zsafe.ts b/i18n/it/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/it/zsafe.ts
+++ b/i18n/it/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/addressbook.ts b/i18n/mk/addressbook.ts
index 4e659af..1a99ddd 100644
--- a/i18n/mk/addressbook.ts
+++ b/i18n/mk/addressbook.ts
@@ -1303,212 +1303,212 @@ SHARP основниот ROM.
         <source>Gender</source>
         <translation>Пол</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Машки</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Женски</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детаљи</translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation>Внеси Забелешка</translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation>Уреди Име</translation>
     </message>
     <message>
         <source>First Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation>средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation>Презиме</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Name Title</source>
-        <translation>Име/Наслов</translation>
+        <translation type="obsolete">Име/Наслов</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Име</translation>
+        <translation type="obsolete">Име</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>средно име</translation>
+        <translation type="obsolete">средно име</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Презиме</translation>
+        <translation type="obsolete">Презиме</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Суфикс</translation>
+        <translation type="obsolete">Суфикс</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Сними како</translation>
+        <translation type="obsolete">Сними како</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Работно Место</translation>
+        <translation type="obsolete">Работно Место</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Одделение/Сектор</translation>
+        <translation type="obsolete">Одделение/Сектор</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Компанија</translation>
+        <translation type="obsolete">Компанија</translation>
     </message>
     <message>
         <source>Business Phone</source>
-        <translation>Тел. на работа</translation>
+        <translation type="obsolete">Тел. на работа</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Факс на работа</translation>
+        <translation type="obsolete">Факс на работа</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Службен мобилен</translation>
+        <translation type="obsolete">Службен мобилен</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Адреса за електронска пошта (основна)</translation>
+        <translation type="obsolete">Адреса за електронска пошта (основна)</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Останати адреси за електронска пошта</translation>
+        <translation type="obsolete">Останати адреси за електронска пошта</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Домашен телефон</translation>
+        <translation type="obsolete">Домашен телефон</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Домашен факс</translation>
+        <translation type="obsolete">Домашен факс</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Приватен Мобилен</translation>
+        <translation type="obsolete">Приватен Мобилен</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Улица на фирмата</translation>
+        <translation type="obsolete">Улица на фирмата</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Град на фирмата</translation>
+        <translation type="obsolete">Град на фирмата</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Република на Фирмата</translation>
+        <translation type="obsolete">Република на Фирмата</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Поштенски код на Фирмата</translation>
+        <translation type="obsolete">Поштенски код на Фирмата</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Држава на фирмата</translation>
+        <translation type="obsolete">Држава на фирмата</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Службен Пејџер</translation>
+        <translation type="obsolete">Службен Пејџер</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Интернет страница на фирмата</translation>
+        <translation type="obsolete">Интернет страница на фирмата</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Канцеларија</translation>
+        <translation type="obsolete">Канцеларија</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Професија</translation>
+        <translation type="obsolete">Професија</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Асистент</translation>
+        <translation type="obsolete">Асистент</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Раководител/менаџер</translation>
+        <translation type="obsolete">Раководител/менаџер</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Улица</translation>
+        <translation type="obsolete">Улица</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Град</translation>
+        <translation type="obsolete">Град</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Република</translation>
+        <translation type="obsolete">Република</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Поштенски код</translation>
+        <translation type="obsolete">Поштенски код</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Држава</translation>
+        <translation type="obsolete">Држава</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Интернет страница</translation>
+        <translation type="obsolete">Интернет страница</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Сопруг/Сопруга</translation>
+        <translation type="obsolete">Сопруг/Сопруга</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>пол</translation>
+        <translation type="obsolete">пол</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Роденден</translation>
+        <translation type="obsolete">Роденден</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Годишнина</translation>
+        <translation type="obsolete">Годишнина</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Надимак</translation>
+        <translation type="obsolete">Надимак</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Деца</translation>
+        <translation type="obsolete">Деца</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Забелешки</translation>
+        <translation type="obsolete">Забелешки</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
index b4dd404..cc66814 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -242,96 +242,103 @@ Do you really want to delete it?</source>
         <source>Could not move
 </source>
         <translation>Не може да се премести</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Испис на Напреден Фајл менаџер</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Пренос од Напреден Фајл Менаџер</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>пратено.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Неможе да се преименува</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Излез</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Сними го излезот во датотека (само име)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Постави дозволи на датотека</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Постави дозволи на датотека за:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>Сопственик</translation>
     </message>
     <message>
         <source>group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>others</source>
         <translation>останати</translation>
diff --git a/i18n/mk/appearance.ts b/i18n/mk/appearance.ts
index 88efa8a..601f8ee 100644
--- a/i18n/mk/appearance.ts
+++ b/i18n/mk/appearance.ts
@@ -149,109 +149,109 @@ This area allows you to select an application and which settings you wish to dis
         <translation>Врв</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Клиикни овде за јазичињата да се појауваваат на врвот на прозорот.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Дно</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Кликни овде за јазичињата да се појавуваат на дното на прозорот.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Насока на ротација:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Подесувања на изгледот</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Ова е прозорец за преглед. Овдека се гледа новиотт изглед на прозорците како што ги менувате опциите.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Стил</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Прозорци</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напредно</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Рестарт</translation>
+        <translation type="obsolete">Рестарт</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Дали сакате да рестартиреате %1 сега?</translation>
+        <translation type="obsolete">Дали сакате да рестартиреате %1 сега?</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>Save Scheme</source>
         <translation>Сними Шема</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Сними шема</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Шемата веќе постои.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Избриши Шема</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Неможе да се избрише шемата.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;ново&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Уреди шема</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Кликни тука за да избереш боја за:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Пример</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Нормален предмет</translation>
     </message>
     <message>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
index 03a5e34..0483730 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -86,97 +86,97 @@
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>
 =</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Стандарден</translation>
     </message>
     <message>
         <source>Calculator</source>
-        <translation>Калкулатор</translation>
+        <translation type="obsolete">Калкулатор</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Стандарден</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/mk/checkbook.ts b/i18n/mk/checkbook.ts
index 5681c9e..592134e 100644
--- a/i18n/mk/checkbook.ts
+++ b/i18n/mk/checkbook.ts
@@ -2,523 +2,749 @@
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Нова сметка</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Информации</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Трансакции</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Графикони</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Заштита со лозинка</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Кликни овде за да се заштити со лозинка оваа сметка.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Овде внеси име на смтеката.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Избети тип на сметка овде.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Штедна</translation>
+        <translation type="obsolete">Штедна</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Тековна</translation>
+        <translation type="obsolete">Тековна</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>Кредитна</translation>
+        <translation type="obsolete">Кредитна</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Пазар на пари</translation>
+        <translation type="obsolete">Пазар на пари</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Заеднички фонд</translation>
+        <translation type="obsolete">Заеднички фонд</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Останато</translation>
+        <translation type="obsolete">Останато</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Банка:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Внеси име на банката за оваа сметка. </translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Број на сметка:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Внеси го бројот на сметката овде.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN број:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Внеси PIN број за оваа сметка.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Почетна состојба:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Внеси ја почетната состојба на оваа сметка.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Внеси додатни информации за сметката.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Моментална состојба: %10.00</translation>
+        <translation type="obsolete">Моментална состојба: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Овде е прикажана моменталната состојба на оваа сметка.</translation>
+        <translation type="obsolete">Овде е прикажана моменталната состојба на оваа сметка.</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>Ова е лита на сите трансакции внесени за оваа сметка.
 
 За да се подреди по полиња, кликни на името на колоната.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Број</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Сума</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Кликни овде за внесување на нова трансакција.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Одбери трансакција и потоа кликни овде за да се измени.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Избери сметка и потоа кликни овде зада се избрише.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Избери го саканиот графикон и потоа кликни на Нацртај копчето.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Кликни на саканиот тип на графикон.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Состојба на сметка</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Повлекувања на средства по категорија</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Депозити по категорија</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Нацртај</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Кликни овде за да се нацрта избраниот графикон.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Моментална состојба: %1 %2</translation>
+        <translation type="obsolete">Моментална состојба: %1 %2</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Потврдете лозинка</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Потврдете лозинка:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Внесете лозинка за да го потврдите бришењето на заштитата со лозинка:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Избриши трансакција</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Состојба</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Конфигурирај Сметка</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Внеси симбол за валута:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Внеси ги симболот на локалната валута овде.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Покажи дали сметката е заштитена 
 со лозинка</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>Кликни овде за да се избере дали на главниот прозорец да се покажува дали сметката е заштитена или не со лозинка.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Покажи состојби на сметки</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Кликно овде за да се избере дали главниот прозорец ќе ги прикажува моменталните состојби за секоја сметка.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Избриши</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Сметка</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нова</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Кликни овде за да се креира нова сметка.
 
 Може исто така да изберете Ново од менито на Сметка.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</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>Избери сметка и потоа кликни овде за да се уредува.
 
 Може исто да се одбере Уреди од менито Сметка, или да се кликне и да се задржи на името на сметката.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Избери сметка и потоа кликни овде за да се избрише.
 
 Исто така можете да изберете Избриши од менито Сметка.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Кликни овде за да конфигурира апликацијава.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Ова е листа на моментално достапните сметки.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Име на сметка</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Состојба</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Внесете лозинка:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Избриши сметка</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Дата</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Уреди</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Нова</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Избриши</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Штедна</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Тековна</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">Кредитна</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Пазар на пари</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Заеднички фонд</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Останато</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Автомобил</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Сметки</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">ЦД-а</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Облека</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Компјутер</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVD-а</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Забава</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Храна</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Гориво</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Општо</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Филмпви</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Кирија</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Патувања</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Работа</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Член на фамилија</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Општо Кредит</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Трансакција за</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Повлекување средства</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Овде се избира дали трансакцијата е повлекување на средства или депозит.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Депозит</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Датум:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Избери датум на трансакцијата.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Број:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Внеси број на чек.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Внеси опис на трансакцијата.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Избери категорија на трансакцијата.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Избери тип на трансакција.
 
 Опциите варираат во зависност од тоа дали трансакцијата е депозит или повлекување на средства.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Сума:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Внеси сума на трансакцијата.
 
 Внесената вредност треба секогаш да е позитивна.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Такса:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Внеси ја сумата на таксата поврзана со трансакцијата.
 
 Вредноста секогаш теба да биде позитивна.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Забелешки:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Внеси додатни информации за трансакцијата.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Автомобил</translation>
+        <translation type="obsolete">Автомобил</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Сметки</translation>
+        <translation type="obsolete">Сметки</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>ЦД-а</translation>
+        <translation type="obsolete">ЦД-а</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Облека</translation>
+        <translation type="obsolete">Облека</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Компјутер</translation>
+        <translation type="obsolete">Компјутер</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVD-а</translation>
+        <translation type="obsolete">DVD-а</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Електроника</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Забава</translation>
+        <translation type="obsolete">Забава</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Храна</translation>
+        <translation type="obsolete">Храна</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Гориво</translation>
+        <translation type="obsolete">Гориво</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Општо</translation>
+        <translation type="obsolete">Општо</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Филмпви</translation>
+        <translation type="obsolete">Филмпви</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Кирија</translation>
+        <translation type="obsolete">Кирија</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Патувања</translation>
+        <translation type="obsolete">Патувања</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Камата на долг</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Напишан чек</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Трансфер</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Кредитна Картичка</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Работа</translation>
+        <translation type="obsolete">Работа</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Член на фамилија</translation>
+        <translation type="obsolete">Член на фамилија</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Општо Кредит</translation>
+        <translation type="obsolete">Општо Кредит</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Автоматско Плаќање</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Кеш</translation>
     </message>
-    <message>
-        <source>Electronics</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index f5e151f..c6a5453 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -106,96 +106,100 @@ Quit anyway?</source>
     <message>
         <source>M</source>
         <translation>П</translation>
     </message>
     <message>
         <source>T</source>
         <translation>В</translation>
     </message>
     <message>
         <source>W</source>
         <translation>С</translation>
     </message>
     <message>
         <source>F</source>
         <translation>П</translation>
     </message>
     <message>
         <source>S</source>
         <translation>С</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00р</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Дуплирај</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Испрати</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -321,96 +325,104 @@ Quit anyway?</source>
     </message>
     <message>
         <source>:00</source>
         <translation>:00</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Локација:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Ова е настан кој трае цел ден.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Јан-00. Јан</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>С</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>С: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Пон.
 Понеделник</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Втор.
 Вторник</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Сред,
 Среда</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Чет.
 Четврток</translation>
     </message>
     <message>
         <source>Fr</source>
         <comment>Friday</comment>
         <translation type="obsolete">Пет.
 Петок</translation>
@@ -478,137 +490,137 @@ Quit anyway?</source>
         <translation>Нов настан</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Локација</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Категорија</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Состанок</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Ручек</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Патување</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Опис</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Почеток-Крај</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Јан 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Време на почеток</translation>
+        <translation type="unfinished">Време на почеток</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Цел Ден</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Временска зона</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Аларм</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>минути</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Тивок</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Гласно</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Повторување</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Без Повторување...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Забелешка...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Време на почеток</translation>
+        <translation type="obsolete">Време на почеток</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Уреди забелешка</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Ручек</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Почеток</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Крај</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/mk/doctab.ts b/i18n/mk/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/mk/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/filebrowser.ts b/i18n/mk/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/mk/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/gsmtool.ts b/i18n/mk/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/mk/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/kate.ts b/i18n/mk/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/mk/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 92c9598..6753622 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Подесувања на мени</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Палета</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>О-мени</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Табови</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Вчитај аплети во О-мени:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Прикажи ги јазичињата од главното во О-менито</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Одбележи ги аплетите кои ќе бидат во О-менито.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Додава содржини од главното мени во О-менито.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Пример 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Пример 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Пример 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Уреди Јазиче</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Позадина</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Фонт</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Икони</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Преглед на %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Ова е груб преглед на  избраното јазиче.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Користи свој фонт</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -106,103 +160,111 @@
         <source>Default</source>
         <translation>Основни</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Големина:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Мало</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Големо</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Боја:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Јазичиња на главно мени:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>панел</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Ново</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Вклучи голем индикатор за зафатеност</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Вклучи трепкачки индикатор за зафатеност</translation>
+        <translation type="obsolete">Вклучи трепкачки индикатор за зафатеност</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Избери го јазичето што треба да се уредува или брише.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Додава ново јазиче на главното мени.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Отвара нов дијалок за подесување на избраното јазиче.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Брише јазиче од главното мени.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Активирај го ова ако сакаш да видиш голем индикатор за зафатеност на средината на екранот наместо тој во панелот.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Активирај го ова ако сакаш трепкачки индикатор на зафатеност за време на вчитвуањето на апликациите во главното мени.</translation>
+        <translation type="obsolete">Активирај го ова ако сакаш трепкачки индикатор на зафатеност за време на вчитвуањето на апликациите во главното мени.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Сите јазичиња</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Документи</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Не е имплементирано</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Вчитај аплети во панелот:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Одбери ги аплетите што треба да се прикажат во панелот.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libclockapplet.ts b/i18n/mk/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/mk/libclockapplet.ts
+++ b/i18n/mk/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/mk/libfreetypefactory.ts b/i18n/mk/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libkeyview.ts b/i18n/mk/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/mk/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libmemoryapplet.ts b/i18n/mk/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/mk/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libmpeg3plugin.ts b/i18n/mk/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/liboapp.ts b/i18n/mk/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libopie.ts b/i18n/mk/libopie.ts
index 0d6aa62..fb348b6 100644
--- a/i18n/mk/libopie.ts
+++ b/i18n/mk/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>копје порака</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Копче дома</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>копче сними</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>ротирање на екран</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Подредување:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Разместување:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Вредност:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Црвена:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Зелена:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Плава:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Алфа канал:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Избери боја</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Повеќе</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Повеќе...</translation>
+        <translation type="obsolete">Повеќе...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Диалог на датотеки</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Отвори</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Сними</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Име:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Mime Тип</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Голем</translation>
@@ -364,114 +376,118 @@ and </source>
     </message>
     <message>
         <source>week(s)</source>
         <translation>недели</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Повторувај по</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Ден</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>датум</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>месеци</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>години</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Време:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Одбери Време:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Документи</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Датотеки</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Сите пораки</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">Опис:</translation>
+        <translation type="unfinished">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Многу високо</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Висок</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Нормално</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низок</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Многу ниско</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Напредок:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Краен рок:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Основна E-mail адреса:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Канцеларија:</translation>
@@ -596,80 +612,252 @@ and </source>
         <source>Every</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 секој</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 секој</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="obsolete">%1 %1 од секој</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Понеделник</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Вторник</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Среда</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Четврток</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Петок</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Сабота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Недела</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <source>The %1 %2 of every</source>
+        <translation type="unfinished">%1 %2 од секој</translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 %2 of every</source>
-        <translation type="unfinished">%1 %2 од секој</translation>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>st</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>nd</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>rd</translation>
     </message>
     <message>
         <source>th</source>
         <translation>th</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiecore2.ts b/i18n/mk/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/mk/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libopiedb2.ts b/i18n/mk/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libopiemm2.ts b/i18n/mk/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libqdasher.ts b/i18n/mk/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/mk/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
index b4bad0b..cc2252c 100644
--- a/i18n/mk/libqpe.ts
+++ b/i18n/mk/libqpe.ts
@@ -818,109 +818,97 @@ Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Грешка</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Грешка</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 документ</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF картичка</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Тврд диск</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD картичка</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC картичка</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI тврд диск</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Внатрешна меморија</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Внатрешен медиум</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/mk/librestartapplet.ts b/i18n/mk/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/libtinykate.ts b/i18n/mk/libtinykate.ts
index 22eedb2..5e5ac2c 100644
--- a/i18n/mk/libtinykate.ts
+++ b/i18n/mk/libtinykate.ts
@@ -1,22 +1,975 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Имаше проблем при креирање на
 конфигурациските информации за 
 оваа програма
 
 ослободете малку простор и обидете се повторно.</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/mk/libtodayaddressbookplugin.ts b/i18n/mk/libtodayaddressbookplugin.ts
index a7f820d..482e046 100644
--- a/i18n/mk/libtodayaddressbookplugin.ts
+++ b/i18n/mk/libtodayaddressbookplugin.ts
@@ -1,94 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Максимален бр. на линии:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Подесете го максималниот бр. на линии кои ќе се покажуваат за секоја годишнина/роденден</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Скрати линија по Х карактери:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>После колку карактери информацијата за настанот би требало да биде скратена</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Денови за гледање напред:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Колку денови напред во месецот треба да се изврши пребарување</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">За да се активираат промените: Рестартирај ја апликацијата!</translation>
+        <translation type="unfinished">За да се активираат промените: Рестартирај ја апликацијата!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Намести боја на наслов:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Бои за насловите!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Намести боја за настан:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Оваа боја ке се користи за да ги прикажува родендените/годишнините!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Намести боја за 
 итно ако е под</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>денови:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Оваа боја ќе се користи ако настанот наближува!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Оваа боја ќе се користи ако роденденот/годишнијната е поблиски од дадениот број на денови!</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Додаток Адресар</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Следниот роденден е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нема родендени во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Следната годишнина е во &lt;b&gt;%1&lt;/b&gt; денови:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Нема годишнини во следните &lt;b&gt;%1&lt;/b&gt; денови!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Базата на податоци не го овозможува ова пребарување! Надградете ги libOpie библиотеките! &lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libvtapplet.ts b/i18n/mk/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/mk/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/light-and-power.ts b/i18n/mk/light-and-power.ts
index 60281d0..0bf11fd 100644
--- a/i18n/mk/light-and-power.ts
+++ b/i18n/mk/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 Чекори</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation>Подесувања за светлото и енергијата</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>на Батерија</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Оснопвни подесувања</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>сек</translation>
     </message>
     <message>
         <source>never</source>
         <translation>нокогаш</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Изгасисветло по</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Намали светло по</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Супендирај по</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Деактивирај ЛЦД екран (не суспендира)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Светло</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
         <translation>постави фиксна вредност за светлото</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Исклучи</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Светлото на екранот може автоматски да се подесува во заивснот од светлината околу вас. ПОдесувањата за светлост сеуште влијаат на просечното осветлување.</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Калибрирај</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Напредни подесувања за управување со светлосниот сензор</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>на Мрежа</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Предупредувања</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Интервал за предупредување на слаба батерија</translation>
     </message>
     <message>
         <source> %</source>
         <translation>%</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>На кое ниво набатеријата треба предупредувањето да се појави</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>Колку често треба да се проверува за нивото на батеријата. Ова одредува колку често ќе има известувања за ситуации со слаба батерија </translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>На кое ниво на батеријата треба да се појави критичното предупредување</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>предупредување за многу ниско ниво на батерија</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>предупредување за критично ниво на батерија</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Шпдесување на сензор</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Целосно</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Исклучи</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Темно</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Светло</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Чекори</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Интервал на проверка</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>сек</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/mobilemsg.ts b/i18n/mk/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/mk/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/oipkg.ts b/i18n/mk/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/mk/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/op-qws.ts b/i18n/mk/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/mk/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/opie-login.ts b/i18n/mk/opie-login.ts
index e368a55..fc7fcc6 100644
--- a/i18n/mk/opie-login.ts
+++ b/i18n/mk/opie-login.ts
@@ -6,92 +6,96 @@
 accurately to calibrate your screen.</source>
         <translation>Притиснете на крстовите цврсто и 
 прецизно за да го калибрирате екранот.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Добредојдовте во Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Логирај се</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Добредојдовре во OPIE &lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>КОрисник</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Лозинка</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Суспензирај</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Мени</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Рестартирај</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Изклучи</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Погрешна лозинка</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Внесената лозинка е неточна.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">OPIE беше исклучен
 од неозначен сигнал
 (%1)</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Неуспех</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Неможе да се стартува OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Неможе да се префрли на нов идентитет на корисник</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/opierec.ts b/i18n/mk/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/mk/opierec.ts
+++ b/i18n/mk/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/ordesktop.ts b/i18n/mk/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/osearch.ts b/i18n/mk/osearch.ts
index e2c8a8e..91efe41 100644
--- a/i18n/mk/osearch.ts
+++ b/i18n/mk/osearch.ts
@@ -32,96 +32,100 @@
     <message>
         <source>Search</source>
         <translation>Пребарувај</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Спребарувај Се</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Внимавај на големи и мали букви</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>КОристи спец. карактери</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Внеси ги зборовите кои се пребаруваат</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Резултати</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show completed tasks</source>
         <translation>прикажи завршени задачи</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>прикажи изминати настани</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>барај во датуми</translation>
     </message>
     <message>
         <source>show</source>
         <translation>прикажи</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>уреди</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>изврши</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>офтвори во управувач со датотеки</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Датотека:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Врска:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index 3985967..96acd4f 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Проблем со апликацијата</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -193,96 +197,100 @@ Please charge the back-up battery.</source>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Барање документи</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Пребарување на документи</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Стартувач</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Нема Апликација</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Документи</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Преглед по икони</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Преглед по листа</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 датотеки</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Аите типови на датотека</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Преглед на документи</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Внесен медиум</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Аудио</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Слика</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Текст</translation>
     </message>
     <message>
         <source>Video</source>
@@ -309,180 +317,200 @@ Please charge the back-up battery.</source>
         <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Не го барај овој медиум пак</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Состојба на батерија</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">Нивото на батеријата е критично!</translation>
+        <translation type="obsolete">Нивото на батеријата е критично!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">Помошната батерија е многу слаба.
+        <translation type="obsolete">Помошната батерија е многу слаба.
 Наполни ја помошната батерија.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">Визиткарта</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Изгаси...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Исклучи</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Исклучи Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Рестартирај</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Рестартирај Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Изгаси</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Откажи</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Врска за синхронизирање</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
+        <translation type="obsolete">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Одбиј</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Дозволи</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Синхронизирање</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Контакти&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Откажи</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/quicklauncher.ts b/i18n/mk/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index d116ca2..8c32bcc 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Намести лозинја</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Смени лозинка</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Внеси лозинка</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Неточна лозинка</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Лозинката не е точна.
 Одбиен пристап</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Внеси нова лозинка</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Повтторно внеси лозинка</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24 </translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/24 </translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Сигурносни подесувања</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Смени лозинка</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Избриши лозинка</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Барај лозинка на подигање</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхронизирај</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Прифати синхронизација од мрежа:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (основна)</translation>
+        <translation type="obsolete">192.168.129.0/24 (основна)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24 </translation>
+        <translation type="obsolete">192.168.1.0/24 </translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/24 </translation>
+        <translation type="obsolete">192.168.0.0/24 </translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Секој</translation>
+        <translation type="obsolete">Секој</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Ништо</translation>
+        <translation type="obsolete">Ништо</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/showimg.ts b/i18n/mk/showimg.ts
index 81c2d9a..65f5349 100644
--- a/i18n/mk/showimg.ts
+++ b/i18n/mk/showimg.ts
@@ -103,86 +103,83 @@
         <source> - Image Viewer</source>
         <translation> - Прегледувач на слики</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 бои</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Вистински бои</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 алфа нивоа</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-битен алфа канал</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Слајд-приказ</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Каснење помеѓу слики</translation>
     </message>
     <message>
         <source>s</source>
         <translation>с</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Повтори Слајд-приказ</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Прикажи ги сликите обратно</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Вчитај ги сликите ротирани за 90 степени</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Брзо вчитување на слики</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/sound.ts b/i18n/mk/sound.ts
index 2508a15..ec52105 100644
--- a/i18n/mk/sound.ts
+++ b/i18n/mk/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>Key_Calender</source>
         <translation>Копче_Календар</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Копче_Контакти</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Копче_Мени</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Копче_Маил</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Граница на снимање (во секунди):</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Неограничено</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Рестартирај го Opiе ако треба</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 78ff4d3..04be56b 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -30,124 +30,138 @@
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Овој граф прикажува колку се користи од вградената меморија на овој уред.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Овој граф прикажува колку меморија се користи во привремениот RAM диск.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Апликации на процесорот (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Користење на системскиот процесор (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Оваа страна поклажува колку од процесорот се користи.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Тип:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Оваа страна покажува како меморијата се алоцира на овој уред,
+        <translation type="obsolete">Оваа страна покажува како меморијата се алоцира на овој уред,
 Меморијата се каратеризира според:
 
 1. Искористена - меморија која ја искоритуваат апликациите
 2. Бафери - привремени локации кои се користат за подобрување на перформансите
 3. Кеширани - информации кои биле скоро користени
 4. Слободна - меморија која не се користи.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Искористени (%1) кВ</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Бафери ( %1 кВ)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Кеширана (%1) кВ</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Слободна (%1 кВ)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Вкупно меморија: %1 кВ</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Модул</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Искоритено#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Искористено од</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Ова е листа на сите вчитани модули на кернелот.
 
 Кликни и задржи на некој од модулите за да видиш додатни информации, или да го тргнеш.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Избери команда и кликни на копчето Прати за да се испрати до избраниот модул.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Кликни овде за зибранта команда да се испрати наиззбраниот модул.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Овој дел прикажува детални информации за модулот.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Да се изврши</translation>
     </message>
@@ -178,119 +192,128 @@ Click and hold on a module to see additional information about the module, or to
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Команда</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Ова е листа на сите провеси.
 
 Килкни и задржи на процес за додатни информации, или да испратиш сигнал.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Избери сигнал и кликни на копчето Прати за да се испрати до процесот.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Прати</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Кликни овде за зибраниот сигнал да се испрати до процесот.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Овде се прикажани деталн информации за процесот.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Да испрати</translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Информации за ситемот</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Меморија</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Медиум</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Процесор</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Процесс</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Модули</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Верзија</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Кернел&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Компајлирано од:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Оpie&lt;/b&gt;&lt;p&gt;Верзија:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Изградено на:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt; Верзија:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Модел:</translation>
+        <translation type="obsolete">&lt;p&gt;Модел:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt; Производител:</translation>
+        <translation type="obsolete">&lt;p&gt; Производител:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Оваа страна ја прикажува верзијата на Opie, кернелот и дистрибудиајта.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/mk/taboapp.ts b/i18n/mk/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/mk/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/mk/tictac.ts b/i18n/mk/tictac.ts
index 9933f78..8ac9535 100644
--- a/i18n/mk/tictac.ts
+++ b/i18n/mk/tictac.ts
@@ -1,48 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Компјутерот стартува</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Човекот почнува</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Играј!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Исклучи</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Кликни Играј за старт</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Направи потег</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Победа!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>КОмпјутерот победи!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Нерешено</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index 97d884f..7e64257 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Денес</translation>
+        <translation type="obsolete">Денес</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Сопственост на</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Пополни ја визит картата</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Кликни овде за да се стартува асоцираната апликација</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Нема додатоци</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Нема активни додатоци</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Денес</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>денес од Maximillian ReiB</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Кликни овде за да се отвори прозорот за конфигурација</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Вчитај додатоци по редослед:</translation>
     </message>
     <message>
diff --git a/i18n/mk/todolist.ts b/i18n/mk/todolist.ts
index 67a86f5..b2fa184 100644
--- a/i18n/mk/todolist.ts
+++ b/i18n/mk/todolist.ts
@@ -181,97 +181,97 @@ The list displays the following information:
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Роковникот неможеше 
 да ги сними промените
 ослободи простор
 и обиди се повторно
 
 Прекини?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Роковник</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Неможе да се уредуваат податоци, во моментот се врши синхронизација,</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>сите задачи?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>сите завршени задачи?</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;%1 новаи задача. &lt;p&gt;Дали да се додадат на листата на задачи?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Нови задачи</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>С.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Опис</translation>
+        <translation type="obsolete">Опис</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Краен рок</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Подеси поставки</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Уредувач на поставки</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Додај</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Одстрани</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Име</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Нов поставка %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде за да поставиш приоритет на нова задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
@@ -289,96 +289,100 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде за да се внесат додатни информации за новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Внеси</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Додади опис новата задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Откажи</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Кликни овде да ресетираш информации за нова задача.
 
 Овој простор дозволува набрзина да се внесе нова задача во листата.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Преглед по табела</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 ден</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Време</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Уреди</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Избриши</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Опис:</translation>
diff --git a/i18n/mk/tonleiter.ts b/i18n/mk/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/mk/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/addressbook.ts b/i18n/nl/addressbook.ts
index 5864e4a..5c3f77d 100644
--- a/i18n/nl/addressbook.ts
+++ b/i18n/nl/addressbook.ts
@@ -1308,212 +1308,212 @@ geleverd!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kirgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestijnse autonome gebieden</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Eilanden</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Druk hier om volledige naam in te vullen</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Vul de hele naam direct in! Als een achternaam met meerdere woorden moet worden ingevuld (bijvoorbeeld &quot;de Vries&quot;), schrijf dan &lt;achternaam&gt;, &lt;voornamen&gt; zoals dit: &quot;de Vries, Peter Paul&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>De functienaam..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Iets als &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>De plaats waar het contact werkt</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Druk om het te veranderen kenmerk te selecteren</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Druk hier om te selecteren hoe de naam opgeslagen(en weergegeven in de lijst) moet worden</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Telefoon werk</translation>
+        <translation type="obsolete">Telefoon werk</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax werk</translation>
+        <translation type="obsolete">Fax werk</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Mobiel werk</translation>
+        <translation type="obsolete">Mobiel werk</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Standaard email</translation>
+        <translation type="obsolete">Standaard email</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Emails</translation>
+        <translation type="obsolete">Emails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Telefoon prive</translation>
+        <translation type="obsolete">Telefoon prive</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax prive</translation>
+        <translation type="obsolete">Fax prive</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Mobiel prive</translation>
+        <translation type="obsolete">Mobiel prive</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Kantoor</translation>
+        <translation type="obsolete">Kantoor</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Beroep</translation>
+        <translation type="obsolete">Beroep</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistent</translation>
+        <translation type="obsolete">Assistent</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Manager</translation>
+        <translation type="obsolete">Manager</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Echtgeno(o)t(e)</translation>
+        <translation type="obsolete">Echtgeno(o)t(e)</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Geslacht</translation>
+        <translation type="obsolete">Geslacht</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Verjaardag</translation>
+        <translation type="obsolete">Verjaardag</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Jaardag</translation>
+        <translation type="obsolete">Jaardag</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Bijnaam</translation>
+        <translation type="obsolete">Bijnaam</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Kinderen</translation>
+        <translation type="obsolete">Kinderen</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Titel</translation>
+        <translation type="obsolete">Titel</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Voornaam</translation>
+        <translation type="obsolete">Voornaam</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Tussenvoegsel</translation>
+        <translation type="obsolete">Tussenvoegsel</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Achternaam</translation>
+        <translation type="obsolete">Achternaam</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Achtervoegsel</translation>
+        <translation type="obsolete">Achtervoegsel</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Sla op als</translation>
+        <translation type="obsolete">Sla op als</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Functie</translation>
+        <translation type="obsolete">Functie</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Afdeling</translation>
+        <translation type="obsolete">Afdeling</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Bedrijf</translation>
+        <translation type="obsolete">Bedrijf</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Bedrijf adres</translation>
+        <translation type="obsolete">Bedrijf adres</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Bedrijf woonplaats</translation>
+        <translation type="obsolete">Bedrijf woonplaats</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Bedrijf provincie</translation>
+        <translation type="obsolete">Bedrijf provincie</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Bedrijf Postcode</translation>
+        <translation type="obsolete">Bedrijf Postcode</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Bedrijf land</translation>
+        <translation type="obsolete">Bedrijf land</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Bedijf pieper</translation>
+        <translation type="obsolete">Bedijf pieper</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Bedrijf website</translation>
+        <translation type="obsolete">Bedrijf website</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Prive adres</translation>
+        <translation type="obsolete">Prive adres</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Prive woonplaats</translation>
+        <translation type="obsolete">Prive woonplaats</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Prive provincie</translation>
+        <translation type="obsolete">Prive provincie</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Prive postcode</translation>
+        <translation type="obsolete">Prive postcode</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Prive land</translation>
+        <translation type="obsolete">Prive land</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Prive website</translation>
+        <translation type="obsolete">Prive website</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notities</translation>
+        <translation type="obsolete">Notities</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/advancedfm.ts b/i18n/nl/advancedfm.ts
index 0bd609d..ff225a6 100644
--- a/i18n/nl/advancedfm.ts
+++ b/i18n/nl/advancedfm.ts
@@ -260,96 +260,103 @@ Wilt u het echt verwijderen?</translation>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished">AdvancedFM ::</translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished">kB vrij</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>Kan huidige map niet verwijderen
 van favorietenlijst.
 Er is geen favoriet van!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Bestand zoeken</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>%1 en alle inhoud
 echt verwijderen?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>%1
 echt verwijderen?</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Kopiëer &apos;%1&apos; als</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Uitvoer</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Sla uivoer op in bestand (alleen bestandsnaam)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Proces kon niet worden gestart</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Fout
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Klaar
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Stel bestandspermissies in</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Stel bestandspermissies in voor:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eigenaar</translation>
     </message>
     <message>
         <source>group</source>
         <translation>groep</translation>
     </message>
diff --git a/i18n/nl/appearance.ts b/i18n/nl/appearance.ts
index 0ccd282..f258e41 100644
--- a/i18n/nl/appearance.ts
+++ b/i18n/nl/appearance.ts
@@ -148,109 +148,109 @@ Dit gedeelte geeft de mogelijkheid een programma te selecteren en de uit te scha
         <translation>Boven</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klik hier om tabs bovenaan het scherm te plaatsen.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Onder</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klik hier om tabs onderaan het scherm te plaatsen.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotatierichting:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Weergaveinstellingen</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dit is een voorbeeldvenster. Kijk hier om te zien hoe de weergave verandert als instellingen worden gewijzigd.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stijl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vensters</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Gevorderd</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Herstart</translation>
+        <translation type="obsolete">Herstart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Wil je %1 nu herstarten?</translation>
+        <translation type="obsolete">Wil je %1 nu herstarten?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="obsolete">Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nee</translation>
+        <translation type="obsolete">Nee</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Sla Schema op</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Sla schema op</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Schema bestaat al.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Verwijder schema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kan huidig schema niet verwijderen.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nieuw&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Wijzig schema</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klik hier om een kleur te kiezen voor:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Voorbeeld</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normaal item</translation>
     </message>
     <message>
diff --git a/i18n/nl/calculator.ts b/i18n/nl/calculator.ts
index 43b1dfa..ab1e161 100644
--- a/i18n/nl/calculator.ts
+++ b/i18n/nl/calculator.ts
@@ -85,97 +85,97 @@
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <source>Calculator</source>
-        <translation>Rekenmachine</translation>
+        <translation type="obsolete">Rekenmachine</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Standaard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/nl/calibrate.ts b/i18n/nl/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/nl/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/checkbook.ts b/i18n/nl/checkbook.ts
index 0a58324..3031393 100644
--- a/i18n/nl/checkbook.ts
+++ b/i18n/nl/checkbook.ts
@@ -2,522 +2,752 @@
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nieuw Kasboek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informatie</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transacties</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafieken</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Beveilig</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klik hier om beveiliging van dit kasboek aan/uit te schakelen.</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Geef hier naam van het kasboek in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Geeft hier het type kasboek in.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Spaargeld</translation>
+        <translation type="obsolete">Spaargeld</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Cheques</translation>
+        <translation type="obsolete">Cheques</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>Belastingen</translation>
+        <translation type="obsolete">Belastingen</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Geldmarkt</translation>
+        <translation type="obsolete">Geldmarkt</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Aandelen</translation>
+        <translation type="obsolete">Aandelen</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Anders</translation>
+        <translation type="obsolete">Anders</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Voer hier de naam van de bank in.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Rekeningnummer:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Voer het bankrekeningnummer van dit kasboek in.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>PIN Code:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Voer hier uw PINcode van dit kasboek in.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Startsaldo:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Voer hier het startsaldo voor dit kasboek in.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Voer hier verdere info voor dit kasboek in.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Huidig saldo: %10.00</translation>
+        <translation type="obsolete">Huidig saldo: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Dt veld geeft het huidige saldo van dit kasboek weer.</translation>
+        <translation type="obsolete">Dt veld geeft het huidige saldo van dit kasboek weer.</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>Dit is een lijst van alle ingevoerde transacties van dit kasboek.
 
 Klik op de kolomnaam om te sorteren op een bepaald veld. </translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Hoeveelheid</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Klik hier om een nieuwe transactie in te voeren.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Selecteer een transactie, en klik hier om dze te wijzigen.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Selecteer een transactie, en klik hier om deze te verwijderen.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Selecteer hieronder de gewenste grafiek, en druk op de Teken knop.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Klik hier om het grafiektype te kiezen.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Kasboeksaldo</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Opnames per kategorie</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Inleggingen per kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Teken</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klik hier om de geselecteerde grafiek te tekenen.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Huidig saldo %1%2</translation>
+        <translation type="obsolete">Huidig saldo %1%2</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer hier a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Bevestig wachtwoord</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Bevestig hier a.u.b. uw wachtwoord:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Voer hier uw wachtwoord in om verwijdering van wachtwoord te bevestigen:</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Verwijder transactie</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Saldo</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfigureer Kasboek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Geef valutasymbool in:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Geef hier uw gewenste valutasymbool in.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Laat zien of het kasboek beveiligd is</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>Klik hier om te selecteren of het algemene scherm moet weergerven dat het kasboek wel of niet met een wachtwoord beveiligd is.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Laat kasboeksaldo&apos;s zien</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Klik hier om te selecteren of het algemene scherm moet weergerven wat van ieder kasboek het huidige saldo is.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Verwijder</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Kasboek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Klik hier om een nieuw kasboek te maken.
 
 U kunt ook Nieuw kiezen uit het Kasboek menu.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</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>Selecteer een kasboek en klik hier om het te wijzigen.
 
 U kunt ook Wijzig uit het Kasboek menu kiezen, of de kasboeknaam ingedrukt houden.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Selecteer een kasboek en klik hier om het te verwijderen.
 
 U kunt ook Verwijder uit het Kasboek menu kiezen.</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Stel in</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Klik hier om dit programma in te stellen.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Dit is een lijst van alle nu aanwezige kasboeken.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Kasboeknaam</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Voer wachtwoord in</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Voer a.u.b. uw wachtwoord in:</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Kasboek</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Datum</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Wijzig</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Nieuw</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Verwijder</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Spaargeld</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Cheques</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">Belastingen</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Geldmarkt</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Aandelen</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Anders</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Auto</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Vaste lasten</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CD&apos;s</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Kleding</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Computer</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVD&apos;s</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Electronisch</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Amusement</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Eten/Drinken</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Benzine</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Overig</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Films</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Huur</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Reizen</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Werk</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Familie</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Diverse inkomsten</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transactie voor</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Opname</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Selecteer hier of de transactie een opname of een bijboeking is.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Bijboeking</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Selecteer hier de datum van de transactie.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nummer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Voer hier het kasboeknummer in.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Voer hier de omschrijving van de transactie in.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Voer hier de transactiekategorie in.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Type:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Selecteer hier het transactietype.
 
 De opties die worden weergegeven zijn erop gebaseerd of dit een bijboeking of een opname is.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Bedrag:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Voer hier het bedrag van de transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Onkosten:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Voer hier de onkosten van deze transactie in.
 
 Dit bedrag moet altijd positief zijn.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notities:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Voer hier extra informatie over de transactie in.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Auto</translation>
+        <translation type="obsolete">Auto</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Vaste lasten</translation>
+        <translation type="obsolete">Vaste lasten</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CD&apos;s</translation>
+        <translation type="obsolete">CD&apos;s</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Kleding</translation>
+        <translation type="obsolete">Kleding</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Computer</translation>
+        <translation type="obsolete">Computer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVD&apos;s</translation>
+        <translation type="obsolete">DVD&apos;s</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electronica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Amusement</translation>
+        <translation type="obsolete">Amusement</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Eten/Drinken</translation>
+        <translation type="obsolete">Eten/Drinken</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Benzine</translation>
+        <translation type="obsolete">Benzine</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Overig</translation>
+        <translation type="obsolete">Overig</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Films</translation>
+        <translation type="obsolete">Films</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Huur</translation>
+        <translation type="obsolete">Huur</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Reizen</translation>
+        <translation type="obsolete">Reizen</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Rente op leningen</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheques</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Overboekingen</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Credit Card</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Werk</translation>
+        <translation type="obsolete">Werk</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Familie</translation>
+        <translation type="obsolete">Familie</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Diverse inkomsten</translation>
+        <translation type="obsolete">Diverse inkomsten</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Autom. Betalingen</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Contant</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Electronisch</translation>
+        <translation type="obsolete">Electronisch</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/datebook.ts b/i18n/nl/datebook.ts
index 854c918..a165576 100644
--- a/i18n/nl/datebook.ts
+++ b/i18n/nl/datebook.ts
@@ -105,96 +105,100 @@ Toch afsluiten?</translation>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00 u</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Dupliceer</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Verstuur</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -324,97 +328,97 @@ Toch afsluiten?</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Standaardinst.</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Locatie:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Deze afspraak duurt de hele dag.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">MDWDVZZM
+        <translation type="unfinished">MDWDVZZM
 
 Weekdagen</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="obsolete">M
 
 Maandag</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">D
 
 Dinsdag</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">W
 
 Woensdag</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
@@ -529,137 +533,137 @@ Zondag</translation>
         <translation>Nieuwe afspraak</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Plaats</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Vergadering</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Lunch</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Diner</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Reis</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Omschrijving</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Start - Eind</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Aanvangstijd</translation>
+        <translation type="unfinished">Aanvangstijd</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dag</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Tijdzone</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minuten</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Luid</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Herhaal</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Geen herhaling...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opmerking...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Aanvangstijd</translation>
+        <translation type="obsolete">Aanvangstijd</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Wijzig opmerking</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Lunch</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Einde</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>De %1 %1 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/nl/doctab.ts b/i18n/nl/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/nl/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/filebrowser.ts b/i18n/nl/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/nl/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/gsmtool.ts b/i18n/nl/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/nl/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/kate.ts b/i18n/nl/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/nl/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/launchersettings.ts b/i18n/nl/launchersettings.ts
index cee6fba..cdd5f2a 100644
--- a/i18n/nl/launchersettings.ts
+++ b/i18n/nl/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Launcher instellingen</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Taakbalk</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Tabbladen</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Laad applets in O-Menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Laat Launcher tabbladen zien in O_Menu</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Vink de applets aan die je wilt gebruiken in het O-menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Voegt de inhoud van de Launcher tabbladen toe aan het O-Menu.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Voorbeeld 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Voorbeeld 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Voorbeeld 3</translation>
     </message>
 </context>
 <context>
     <name>SampleView</name>
     <message>
         <source>Sample 1</source>
         <translation type="obsolete">Voorbeeld 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="obsolete">Voorbeeld 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="obsolete">Voorbeeld 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Wijzig Tabblad</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Achtergrond</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Lettertype</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Iconen</translation>
@@ -121,103 +175,111 @@
         <source>Default</source>
         <translation>Satandaard</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Grootte:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Klein</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Kleur:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Launcher tabbladen:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foo-balk</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Gebruik groot &apos;bezig&apos; icoon</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Gebruik knipperend &apos;bezig&apos; icoon</translation>
+        <translation type="obsolete">Gebruik knipperend &apos;bezig&apos; icoon</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Selecteer het Launcher tabblad dat je wilt wijzigen of verwijderen.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Voegt een nieuwe tab toe aan de Launcher.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Opent een nieuwe dialoog om de geselecteerde tab te veranderen.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Verwijdert een tab van de Launcher.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Activeer dit als je een groot &apos;bezig&apos; icoon in het midden van het scherm wilt ipv een in de taakbalk.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Activeer dit als je een knipperend &apos;bezig&apos; icoon wilt bij het starten van programma&apos;s in de Launcher.</translation>
+        <translation type="obsolete">Activeer dit als je een knipperend &apos;bezig&apos; icoon wilt bij het starten van programma&apos;s in de Launcher.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Alle tabbladen</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Nog niet geimplementeerd</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Laad applets in de Taakbalk:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Vink de applets aan die je in de taakbalk wilt hebben.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libfreetypefactory.ts b/i18n/nl/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libliquid.ts b/i18n/nl/libliquid.ts
index 2c41418..cbf52e0 100644
--- a/i18n/nl/libliquid.ts
+++ b/i18n/nl/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Vloeibaar</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Stijl Vloeibaar</translation>
+        <translation type="unfinished">Stijl Vloeibaar</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Geen transparantie</translation>
+        <translation type="unfinished">Geen transparantie</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Gestippeld, achtergrondkleur</translation>
+        <translation type="unfinished">Gestippeld, achtergrondkleur</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Gestippeld, knopkleur</translation>
+        <translation type="unfinished">Gestippeld, knopkleur</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Transparant gestippeld, achtergrondkleur</translation>
+        <translation type="unfinished">Transparant gestippeld, achtergrondkleur</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Transparant gestippeld, knopkleur</translation>
+        <translation type="unfinished">Transparant gestippeld, knopkleur</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Eigen transparantie</translation>
+        <translation type="unfinished">Eigen transparantie</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menukleur</translation>
+        <translation type="unfinished">Menukleur</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Tekstkleur</translation>
+        <translation type="unfinished">Tekstkleur</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opaciteit</translation>
+        <translation type="unfinished">Opaciteit</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Gebruik geschaduwde menutekst</translation>
+        <translation type="unfinished">Gebruik geschaduwde menutekst</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Maak gereedschapsbalk vlak</translation>
+        <translation type="unfinished">Maak gereedschapsbalk vlak</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Gestippeld contrast</translation>
+        <translation type="unfinished">Gestippeld contrast</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Vloeibaar</translation>
+        <translation type="unfinished">Vloeibaar</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>High Performance Vloeibaar stijl door Mosfet</translation>
+        <translation type="unfinished">High Performance Vloeibaar stijl door Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libmemoryapplet.ts b/i18n/nl/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/nl/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libmpeg3plugin.ts b/i18n/nl/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/liboapp.ts b/i18n/nl/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libopie.ts b/i18n/nl/libopie.ts
index 1451901..ba833e3 100644
--- a/i18n/nl/libopie.ts
+++ b/i18n/nl/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Mailknop</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Thuisknop</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Opnameknop</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Beeldschermrotatie</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Lager en omhoog</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Lager en omlaag</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Lager en naar rechts</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Lager en naar links</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Hoger en omhoog</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Hoger en omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Hoger en naar rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Hoger en naar links</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Kleur:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Verz:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Waarde:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Rood:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Groen:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Blauw:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Alpha kanaal:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Selecteer kleur</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Meer</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Meer...</translation>
+        <translation type="obsolete">Meer...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>Bestandsdialoog</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Open</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sla op</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Naam:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Mime Type</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Groot</translation>
@@ -364,186 +376,190 @@ and </source>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>we(e)k(en)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Herhaal op</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>maand(en)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ja(a)r(en)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Tijd:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Kies tijd:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Alle bestanden</translation>
     </message>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">Omschrijving:</translation>
+        <translation type="unfinished">Omschrijving:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioriteit:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Heel hoog</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Hoog</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normaal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Heel laag</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Voortgang:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Einddatum:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Standaard email:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Bedrijf:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Bedrijfswebpagina:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Bedrijfs telefoon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Bedrijfs fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Bedrijfs mobiel:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Bedrijfs pieper:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Priveadres:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Home Web Page: </source>
         <translation>Prive webpagina:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Prive telefoon:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Prive Fax:</translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation>Prive mobiel:</translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation>Alle Emails:</translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation>Beroep:</translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation>Assistent:</translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation>Manager:</translation>
     </message>
     <message>
         <source>Male</source>
         <translation>Man</translation>
     </message>
     <message>
         <source>Female</source>
         <translation>Vrouw</translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation>Geslacht:</translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation>Wederhelft:</translation>
@@ -595,69 +611,249 @@ and </source>
     <message>
         <source>Every</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 iedere</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>De %1 iedere</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>De %1 %2 van iedere</translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Maandag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dinsdag</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Woensdag</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Donderdag</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Vrijdag</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Zaterdag</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Zondag</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>ste</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>de</translation>
     </message>
     <message>
         <source>th</source>
         <translation>de</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libopiecore2.ts b/i18n/nl/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/nl/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libopiedb2.ts b/i18n/nl/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libopiemm2.ts b/i18n/nl/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libopiepim2.ts b/i18n/nl/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libopieui2.ts b/i18n/nl/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libqdasher.ts b/i18n/nl/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/nl/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/libqpe.ts b/i18n/nl/libqpe.ts
index 7c9c4b3..76a1340 100644
--- a/i18n/nl/libqpe.ts
+++ b/i18n/nl/libqpe.ts
@@ -820,109 +820,97 @@ wilt verwijderen?</translation>
         <translation>jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>feb</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>apr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>mei</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>aug</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Fout</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Fout</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="obsolete">&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="obsolete">Wat is dit...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="obsolete">Klik om dit venster te sluiten zoner op te slaan.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="obsolete">Klik om dit venster te sluiten.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="obsolete">Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="obsolete">Klik om dit venster beweegbaar te maken.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="obsolete">Klik om te maximaliseren.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF Kaart</translation>
diff --git a/i18n/nl/librestartapplet.ts b/i18n/nl/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/libtinykate.ts b/i18n/nl/libtinykate.ts
index c1cf2ba..4c3eb31 100644
--- a/i18n/nl/libtinykate.ts
+++ b/i18n/nl/libtinykate.ts
@@ -1,23 +1,976 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Plaatsgebrek</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Er is een probleem bij het maken
 van de KateConfiguratie Informatie
 voor dit programma.
 
 Probeer ruimte vrij te maken
 en probeer het nog eens.</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/nl/libtodayaddressbookplugin.ts b/i18n/nl/libtodayaddressbookplugin.ts
index ba47ec0..cb11776 100644
--- a/i18n/nl/libtodayaddressbookplugin.ts
+++ b/i18n/nl/libtodayaddressbookplugin.ts
@@ -1,94 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Max lijnen:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Stel het maximumaantal lijnen in dat getoond moet worden per verjaardag/jaardag</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Knip lijn na X tekens:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Na hoeveel tekens de info over de taak afgebroken moet worden</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Dagen vooruitzien:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Hoeveel dagen er vooruit gezocht moet worden</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Om instellingen te activeren: Herstart programma!</translation>
+        <translation type="unfinished">Om instellingen te activeren: Herstart programma!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Stel titelbalkkleur in:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Kleuren voor de titelbalk!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Stel beginkleur in:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Deze kleur zal worden gebruikt voor verjaardagen/jaardagen!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Stel urgentkleur in
 als minder dan</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>dagen:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Deze urgentkleur zal worden gebruikt als de taak dichtbij is!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>De urgentkleur wordt gebruikt als de verjaardag/jaardag dichterbij is dan het aangegeven aantal dagen!</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Adresboek plugin</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Volgende verjaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Geen verjaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Volgende jaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Geen jaardagen in komende &lt;b&gt;%1&lt;/b&gt; dagen!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Database biedt deze zoekopdracht niet! libOpie upgraden aub!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libvtapplet.ts b/i18n/nl/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/nl/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/light-and-power.ts b/i18n/nl/light-and-power.ts
index 47060af..cafee94 100644
--- a/i18n/nl/light-and-power.ts
+++ b/i18n/nl/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 Stappen</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation>Licht- en Energieinstellingen</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>op Batterij</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Algemene instellingen</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nooit</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Licht uit na</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Licht laag na</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Slaap na</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Deactiveer alleen scherm (geen slaapstand)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Achtergrondlicht</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
         <translation>stel een vaste waarde in voor achtergrondlicht</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Uit</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Door het omgevingslicht te meten, kan de schermverlichting automatisch worden aangepast. De helderheidinstelling bepaalt nog steeds de gemiddelde lichtsterkte.</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Kalibreer</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Geavanceerde instellingen voor lichtsensor</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>op Stroom</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Waarschuwingen</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Lage energiewaarschuwing interval</translation>
     </message>
     <message>
         <source> %</source>
         <translation>%</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>Bij welk energieniveau moet de waarschuwing starten</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>hoe vaak moet er gekeken worden naar het energieniveau. Dit bepaalt hoe vaak de waarschuwing voorkomt bij gebrek aan energie</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>Bij welk energieniveau moet de kritieke waarschuwing starten</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>Erg lage batterij waarschuwing bij</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>Kritieke lage batterij waarschuwing bij</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Sensorcalibratie</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Vol</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Uit</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Donker</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Licht</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Stappen</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Kontroleer interval</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>sec</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/mobilemsg.ts b/i18n/nl/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/nl/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/oipkg.ts b/i18n/nl/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/nl/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/op-qws.ts b/i18n/nl/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/nl/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/opie-login.ts b/i18n/nl/opie-login.ts
index 1c1ca0f..ad69eb8 100644
--- a/i18n/nl/opie-login.ts
+++ b/i18n/nl/opie-login.ts
@@ -5,93 +5,97 @@
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Raak de kruisjes precies aan om het scherm te calibreren.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Welkom bij Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Log in</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Welkom bij OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Slaapstand</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Herstart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Onjuist wachtwoord</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Het opgegeven wachtwoord is onjuist.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">OPIE is gestopt door een onverwacht signaal: (%1)</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Gefaald</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Kan OPIE niet starten</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Kan niet overschakelen naar nieuwe User</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie werd afgebroken
 door een onbruikbaar
 signaal (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Kan Opie niet starten.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/opierec.ts b/i18n/nl/opierec.ts
index 17cbf24..ab785d5 100644
--- a/i18n/nl/opierec.ts
+++ b/i18n/nl/opierec.ts
@@ -152,60 +152,68 @@ echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translati
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Kan audiobestand niet openen.</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Speel af</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Stuur via IR</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Hernoem</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>Beam via IR</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR verzonden.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Opname</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Plaats</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Golfvormcompressie (kleinere bestanden)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>auto Stil</translation>
+        <translation type="obsolete">auto Stil</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/ordesktop.ts b/i18n/nl/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/osearch.ts b/i18n/nl/osearch.ts
index ffab2ac..dd38757 100644
--- a/i18n/nl/osearch.ts
+++ b/i18n/nl/osearch.ts
@@ -32,96 +32,100 @@
     <message>
         <source>Search all</source>
         <translation>Zoek alles</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Gebruik jokertekens</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>De details van de huidige resultaten</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Voer hier de zoektermen in</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documenten</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Te-doen lijst</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Kontakten</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultaten</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>laat zien</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>verander</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>voer uit</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>open in bestandsmanager</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>open met</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>laat afgemaakte taken zien</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>laat vroegere gebeurtenissen zien</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>zoek in data</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Bestand:</translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 7348d27..120db8a 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Programma probleem</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -194,96 +198,100 @@ Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">Vinden documenten</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">Zoeken documenten</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Geen programma</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Documenten</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Icoonaanzicht</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Lijstaanzicht</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 bestanden</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">Alle types van bestand</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Documentaanzicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">Ingeschakeld medium</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">Audio</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">Plaatjes</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">Tekst</translation>
     </message>
     <message>
         <source>Video</source>
@@ -310,181 +318,201 @@ Reservebatterij opladen aub.</translation>
         <translation type="obsolete">Uw beslissing word opgeslagen op het medium.</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">Vraag niet nogmaals voor dit medium</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">Batterijstatus</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informatie</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;De systeemdatum lijkt niet correct.
 (%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">Batterijlading is kritiek!
+        <translation type="obsolete">Batterijlading is kritiek!
 Laat uitgeschakeld tot kan worden opgeladen!</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">De reservebatterijlading is erg laag.
+        <translation type="obsolete">De reservebatterijlading is erg laag.
 Reservebatterij opladen aub.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">visitekaartje</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Afsluiten...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Beeindigen</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Opie beeindigen</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Herstarten</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Opie herstarten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Afsluiten</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Deze afsluitopties worden voornamelijk voor gebruik tijdens ontwikkeling en tests van het Opie systeem. In een normale omgeving zijn deze opties niet nodig.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Annuleren</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Synchronisatieverbinding</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
+        <translation type="obsolete">Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Weiger</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Een onbekend systeem probeert toegang te krijgen tot dit apparaat. Dit is normaal als dit de eerste keer is dat u synchroniseert.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Sta toe</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Synchroniseren</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kontakten&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Annuleren</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/quicklauncher.ts b/i18n/nl/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/security.ts b/i18n/nl/security.ts
index 60b9ef8..7dbe095 100644
--- a/i18n/nl/security.ts
+++ b/i18n/nl/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Stel PINcode in</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Verander PINcode</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Voer PINcode in</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>PINcode niet correct</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Ingevoerde PINcode is niet correct.
 Toegang geweigerd</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Iedere</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Voer nieuwe PINcode in</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Voer nieuwe opnieuw PINcode in</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Beveiligingsinstellingen</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Verander PINcode</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Schoon PINcode</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Vraag PINcode bij power-aan</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Accepteer sync van netwerk:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (standaard)</translation>
+        <translation type="obsolete">192.168.129.0/24 (standaard)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Iedere</translation>
+        <translation type="obsolete">Iedere</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Geen</translation>
+        <translation type="obsolete">Geen</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;p&gt;PINcode beveiliging biedt slechts een minimale beveiliging tegen toevallige toegang tot dit apparaat.</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>PINcode</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Log in</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Log automatich in</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/showimg.ts b/i18n/nl/showimg.ts
index 604d9b7..3a2b80d5 100644
--- a/i18n/nl/showimg.ts
+++ b/i18n/nl/showimg.ts
@@ -103,86 +103,83 @@
         <source> - Image Viewer</source>
         <translation>- Plaatjeskijker</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>%1 kleuren</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>Ware kleuren</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha lagen</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bits alpha kanaal</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Voorkeuren</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Slideshow</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Tijd tussen plaatjes</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>Herhaal slideshow</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Omgekeerde volgorde</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Laad plaatjes 90 graden gedraaid</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>Snelladen plaatjes</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/sound.ts b/i18n/nl/sound.ts
index 24a27e0..2119c7f 100644
--- a/i18n/nl/sound.ts
+++ b/i18n/nl/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>Key_Calender</source>
         <translation>Toets Kalender</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>Toets Kontakten</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>Toets Menu</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>Toets Mail</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Opnamelimiet in seconden:</translation>
     </message>
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ongelimiteerd</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Herstart Opie indien nodig</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/sysinfo.ts b/i18n/nl/sysinfo.ts
index 7566e15..1d56e8d 100644
--- a/i18n/nl/sysinfo.ts
+++ b/i18n/nl/sysinfo.ts
@@ -30,124 +30,138 @@
         <translation>SC</translation>
     </message>
     <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte van het interne Flash geheugen van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>RA</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>Deze grafiek geeft weer hoeveel ruimte gebruikt wordt op de tijdelijke RAM schijf van dit apparaat.</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Programma GPU gebruik (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Systeem CPU gebruik (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Deze pagina laat zien hoeveel van de processor van dit apparaat gebruikt wordt.</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type:</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw hanheld.
+        <translation type="obsolete">Deze pagina geeft weer hoeveel geheugen (dwz RAM) in gebruik is op uw hanheld.
 Gehugen wordt als volgt onderverdeeld:
 
 1. Gebruikt - Geheugen dat in gebruik is door Opie en lopende programma&apos;s.
 2. Buffers - Tijdelijke opslag tbv verbetering snelheid.
 3. Cache - Recent gebruikte informatie, die nog niet vrijgegeven is.
 4. Vrij - Geheugen dat momenteel niet in gebruik is door Opie of lopende programma&apos;s.</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Gebruikt (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Vrij (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Totaal geheugen: %1 kB</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Module</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Gebruik#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Gebruikt door</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Dit is een lijst van alle kernelmodules die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of hem te beeindigen.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Selecteer hier een commando en klik op de Zend knop (rechts in beeld) om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Klik hier om het commando naar de module te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Dit vlak geeft gedetailleerde informatie over deze module weer.</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">Wilt u dit echt uitvoeren
 </translation>
@@ -181,118 +195,131 @@ Druk een tijd op een module om meer informatie over de module te zien, of hem te
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Commando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Dit is een lijst van alle processen die momenteel geladen zijn op deze handheld.
 
 Druk een tijd op een module om meer informatie over de module te zien, of een signaal te sturen.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Selecteer hier een signaal en klik op de Zend knop (rechts in beeld) om hetnaar dit proces te sturen.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Zend</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Klik hier om het signaal naar dit proces te sturen.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Dit vlak laat gedetailleerde info over dit proces zien.</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">Wilt u dit echt zenden
 </translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>Wilt u %1 echt naar dit onderdeel sturen?</translation>
+        <translation type="obsolete">Wilt u %1 echt naar dit onderdeel sturen?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeeminfo</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Geheugen</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Opslag</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Modules</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Versie: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Gecompileerd door:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versie: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Gebouwd op:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versie:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Model:</translation>
+        <translation type="obsolete">&lt;p&gt;Model:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Fabrikant:</translation>
+        <translation type="obsolete">&lt;p&gt;Fabrikant:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Deze pagina geeft de huidige versies van Opie, de Linux kernel en de distributie van deze handheld weer.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/nl/taboapp.ts b/i18n/nl/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/nl/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/nl/tictac.ts b/i18n/nl/tictac.ts
index b80c416..87aace0 100644
--- a/i18n/nl/tictac.ts
+++ b/i18n/nl/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>Boter, Kaas en Eieren</translation>
+        <translation type="obsolete">Boter, Kaas en Eieren</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computer begint</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Mens begint</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Spelen!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Stop</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Klik Spelen! om te starten</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Doe een zet</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Jij wint!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Computer wint!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Gelijkspel</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/today.ts b/i18n/nl/today.ts
index 5212380..fa502b6 100644
--- a/i18n/nl/today.ts
+++ b/i18n/nl/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Vandaag</translation>
+        <translation type="obsolete">Vandaag</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Bezit van</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Visitekaartje invullen a.u.b.</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klik hier om het bijbehorende programma te starten</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Geen plugins gevonden</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Geen plugins geactiveerd</translation>
     </message>
     <message>
         <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Eigenaar: %1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Vandaag</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Vandaag door Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Klik hier voor het instellingsvenster</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation>Vandaag instelling</translation>
     </message>
     <message>
diff --git a/i18n/nl/todolist.ts b/i18n/nl/todolist.ts
index 67ac649..862f8a5 100644
--- a/i18n/nl/todolist.ts
+++ b/i18n/nl/todolist.ts
@@ -181,97 +181,97 @@ De lijst geeft de volgende info door:
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Todo kon uw wijzigingen
 niet opslaan.
 Maak plaats en probeer
 het nog eens.
 
 Toch stoppen?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Te Doen</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Kan data niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>alle taken?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>alle gedane taken?</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;%1 nieuwe taken aangekomen.&lt;p&gt;Wilt u ze aan de todolijst toevoegen?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nieuwe taken</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioriteit</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Omschrijving</translation>
+        <translation type="obsolete">Omschrijving</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Einddatum</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Stel voorbeelden in</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Voorbeeld editor</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Voeg toe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nieuw voorbeeld %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Voer de prioriteit van de nieuwe taak hier in.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
@@ -299,96 +299,100 @@ It allows you to quickly add a new task to your list.  This area can be shown or
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Voer in</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik hier om een nieuwe taak toe te voegen.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Annuleer</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Klik hier om nieuwe taakinfo te schonen.
 
 Dit vlak wordt de sneltaakbalk genoemd.
 
 Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak kan worden verborgen of getoond door Opties-&gt;&apos;Laat Sneltaakbalk zien&apos; te kiezen in het bovenstaande menu.</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioriteit:</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Kan data niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Kan data niet wijzigen tijdens synchronisatie</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Tabelaanzicht</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 Dag(en)</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Soort</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Wijzig</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Verwijder</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
diff --git a/i18n/nl/tonleiter.ts b/i18n/nl/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/nl/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/nl/zsafe.ts b/i18n/nl/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/nl/zsafe.ts
+++ b/i18n/nl/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/addressbook.ts b/i18n/no/addressbook.ts
index f67677b..20e9401 100644
--- a/i18n/no/addressbook.ts
+++ b/i18n/no/addressbook.ts
@@ -1288,216 +1288,49 @@ is provided free !</source>
         <source>Anniversary</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>First Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Last Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Name Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index e0b6f28..4fb4f6a 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -237,96 +237,103 @@ Er du sikker på at du vil slette?</translation>
     <message>
         <source>Error</source>
         <translation>Feil</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kunne ikke endre filnavn</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>Utskrift</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Lagre utskrift til fil (bare navn)</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Sett fil rettigheter</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Sett fil rettighter for:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>eier</translation>
     </message>
     <message>
         <source>group</source>
         <translation>gruppe</translation>
     </message>
     <message>
         <source>others</source>
         <translation>andre</translation>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index 88ffc08..e1f54a5 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -148,109 +148,109 @@ Dette området tillater deg å velge en applikasjon og hvilke innstillinger du v
         <translation>Topp</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>Klikk her slik at fanene vises på toppen av vinduet.</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Bunn</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the bottom of the window.</source>
         <translation>Klikk her slik at fanene vises på bunnen av vinduet.</translation>
     </message>
     <message>
         <source>Rotation direction:</source>
         <translation>Rotasjonsretning:</translation>
     </message>
     <message>
         <source>Appearance Settings</source>
         <translation>Visningsinnstillinger</translation>
     </message>
     <message>
         <source>This is a preview window.  Look here to see your new appearance as options are changed.</source>
         <translation>Dette er et forhåndsvisningsvindu. Kikk her for å se din nye visning da innstillingene er endret.</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Tegnsett</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farger</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Vinduer</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avansert</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Omstart</translation>
+        <translation type="obsolete">Omstart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Vil du starte om %1 nå?</translation>
+        <translation type="obsolete">Vil du starte om %1 nå?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Ja</translation>
+        <translation type="obsolete">Ja</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nei</translation>
+        <translation type="obsolete">Nei</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Lagre system</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Lagre system</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Systemet eksisterer allerede.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Slett system</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Kan ikke slette nåværende system.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;ny&gt;</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
         <translation>Rediger system</translation>
     </message>
     <message>
         <source>Click here to select a color for: </source>
         <translation>Klikk her for å velge farge for:</translation>
     </message>
 </context>
 <context>
     <name>SampleWindow</name>
     <message>
         <source>Sample</source>
         <translation>Prøve</translation>
     </message>
     <message>
         <source>Normal Item</source>
         <translation>Normalt objekt</translation>
     </message>
     <message>
diff --git a/i18n/no/calculator.ts b/i18n/no/calculator.ts
index 958c4c3..2b4a1cc 100644
--- a/i18n/no/calculator.ts
+++ b/i18n/no/calculator.ts
@@ -83,100 +83,96 @@
     </message>
     <message>
         <source>4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>/</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>9</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Calculator</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index 9d60723..bba6730 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -1,505 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</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>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>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</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>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</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>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</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>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>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Transaction</name>
+    <name>QWidget</name>
     <message>
-        <source>Transaction for </source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Withdrawal</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select date of transaction here.</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number:</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter check number here.</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter description of transaction here.</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select transaction category here.</source>
+        <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>Bills</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>
+        <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
+        <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fee:</source>
+        <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
+        <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information for this transaction here.</source>
+        <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Misc</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Electronics</source>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index 955ce20..88e4a2f 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -100,96 +100,100 @@ Quit anyway?</source>
     <message>
         <source>M</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -315,96 +319,104 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>2</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weekly...</source>
@@ -465,97 +477,97 @@ Quit anyway?</source>
         <source>Home</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loud</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start Time</source>
+        <source>Start time</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/doctab.ts b/i18n/no/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/no/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/filebrowser.ts b/i18n/no/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/no/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/gsmtool.ts b/i18n/no/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/no/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/kate.ts b/i18n/no/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/no/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/launchersettings.ts b/i18n/no/launchersettings.ts
index 8cdb19d..1214e2e 100644
--- a/i18n/no/launchersettings.ts
+++ b/i18n/no/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
@@ -105,104 +159,104 @@
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libclockapplet.ts b/i18n/no/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/no/libclockapplet.ts
+++ b/i18n/no/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/no/libfreetypefactory.ts b/i18n/no/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libkeyview.ts b/i18n/no/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/no/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libmemoryapplet.ts b/i18n/no/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/no/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libmpeg3plugin.ts b/i18n/no/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/liboapp.ts b/i18n/no/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libopie.ts b/i18n/no/libopie.ts
index 24385f3..6f1be7c 100644
--- a/i18n/no/libopie.ts
+++ b/i18n/no/libopie.ts
@@ -16,142 +16,150 @@
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
@@ -363,96 +371,100 @@ and </source>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -579,80 +591,256 @@ and </source>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 %2 of every</source>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libopiecore2.ts b/i18n/no/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/no/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libopiedb2.ts b/i18n/no/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libopiemm2.ts b/i18n/no/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libopiepim2.ts b/i18n/no/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libopieui2.ts b/i18n/no/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libqdasher.ts b/i18n/no/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/no/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/libqpe.ts b/i18n/no/libqpe.ts
index df7c1bc..935ab0b 100644
--- a/i18n/no/libqpe.ts
+++ b/i18n/no/libqpe.ts
@@ -801,112 +801,96 @@ Free some memory and try again.</source>
     <message>
         <source>Jan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TimeZoneSelector</name>
diff --git a/i18n/no/librestartapplet.ts b/i18n/no/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/libtinykate.ts b/i18n/no/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/no/libtinykate.ts
+++ b/i18n/no/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/no/libtodayaddressbookplugin.ts b/i18n/no/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/no/libtodayaddressbookplugin.ts
+++ b/i18n/no/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/libtodaydatebookplugin.ts b/i18n/no/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/no/libtodaydatebookplugin.ts
+++ b/i18n/no/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/libtodaytodolistplugin.ts b/i18n/no/libtodaytodolistplugin.ts
index b423a53..711d14e 100644
--- a/i18n/no/libtodaytodolistplugin.ts
+++ b/i18n/no/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/no/libvtapplet.ts b/i18n/no/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/no/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/light-and-power.ts b/i18n/no/light-and-power.ts
index 9c4d055..886aa2e 100644
--- a/i18n/no/light-and-power.ts
+++ b/i18n/no/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
@@ -67,85 +74,97 @@
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on AC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/mobilemsg.ts b/i18n/no/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/no/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/oipkg.ts b/i18n/no/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/no/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/op-qws.ts b/i18n/no/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/no/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/opie-login.ts b/i18n/no/opie-login.ts
index 71d25f7..1f3290b 100644
--- a/i18n/no/opie-login.ts
+++ b/i18n/no/opie-login.ts
@@ -4,80 +4,80 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/opierec.ts b/i18n/no/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/no/opierec.ts
+++ b/i18n/no/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/ordesktop.ts b/i18n/no/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/osearch.ts b/i18n/no/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/no/osearch.ts
+++ b/i18n/no/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/no/qpe.ts b/i18n/no/qpe.ts
index dde7446..7bc5e05 100644
--- a/i18n/no/qpe.ts
+++ b/i18n/no/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -110,211 +114,221 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/quicklauncher.ts b/i18n/no/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/security.ts b/i18n/no/security.ts
index 5720dc2..8b69c6f 100644
--- a/i18n/no/security.ts
+++ b/i18n/no/security.ts
@@ -1,117 +1,230 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24 (default)</source>
+        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
+        <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Any</source>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>None</source>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>Delete Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/showimg.ts b/i18n/no/showimg.ts
index bb5b89a..625d5b7 100644
--- a/i18n/no/showimg.ts
+++ b/i18n/no/showimg.ts
@@ -103,86 +103,83 @@
         <source> - Image Viewer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> True color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/sound.ts b/i18n/no/sound.ts
index 0d4b825..49336da 100644
--- a/i18n/no/sound.ts
+++ b/i18n/no/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>Key_Calender</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/no/sysinfo.ts b/i18n/no/sysinfo.ts
index a051370..a77fd79 100644
--- a/i18n/no/sysinfo.ts
+++ b/i18n/no/sysinfo.ts
@@ -23,125 +23,129 @@
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>In</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>RA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
-Memory is categorized as follows:
-
-1. Used - memory used to by Opie and any running applications.
-2. Buffers - temporary storage used to improve performance
-3. Cached - information that has recently been used, but has not been freed yet.
-4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Used (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
@@ -154,119 +158,120 @@ Click and hold on a module to see additional information about the module, or to
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available (%1 kB)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CPU</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Vendor: </source>
+        <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/taboapp.ts b/i18n/no/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/no/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/no/tictac.ts b/i18n/no/tictac.ts
index f8eccb8..1e4a751 100644
--- a/i18n/no/tictac.ts
+++ b/i18n/no/tictac.ts
@@ -1,48 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/no/today.ts b/i18n/no/today.ts
index b2add99..61cce5f 100644
--- a/i18n/no/today.ts
+++ b/i18n/no/today.ts
@@ -1,56 +1,52 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
-        <source>Today</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/todolist.ts b/i18n/no/todolist.ts
index 3562af1..94744dd 100644
--- a/i18n/no/todolist.ts
+++ b/i18n/no/todolist.ts
@@ -161,195 +161,195 @@ The list displays the following information:
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</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>all tasks?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>all completed tasks?</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>
     <message>
         <source>C.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority</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>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/tonleiter.ts b/i18n/no/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/no/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/no/zsafe.ts b/i18n/no/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/no/zsafe.ts
+++ b/i18n/no/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 6ef26fd..fb1607a 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -1303,212 +1303,212 @@ dostepny za darmo!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kirgistan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Autonomia Palestynska</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Wietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Wcisnij by wprowadzc imiona i nazwisko</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Wpisz swoje dane dokladnie! Jesli masz wieloczlonowe nazwisko (np. &quot;Van Helsing&quot;), wprowadz &lt;nazwisko&gt;,&lt;imiona&gt; w ten sposob: &quot;Van Helsing, Abraham&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Stanowisko..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Na przyklad &quot;jr&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Miejsce pracy z wizytowki</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Wcisnij by wybrac atrybut do zmiany</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Wcisnij by wybrac sposob zapisania nazwiska (i jego prezentacji na liscie)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Firma - telefon</translation>
+        <translation type="obsolete">Firma - telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Firma - fax</translation>
+        <translation type="obsolete">Firma - fax</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Sluzbowa komorka</translation>
+        <translation type="obsolete">Sluzbowa komorka</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Domyslny e-mail</translation>
+        <translation type="obsolete">Domyslny e-mail</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Adresy e-mail</translation>
+        <translation type="obsolete">Adresy e-mail</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Telefon domowy</translation>
+        <translation type="obsolete">Telefon domowy</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Dom - fax</translation>
+        <translation type="obsolete">Dom - fax</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Prywatna komorka</translation>
+        <translation type="obsolete">Prywatna komorka</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Biuro</translation>
+        <translation type="obsolete">Biuro</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Zawod</translation>
+        <translation type="obsolete">Zawod</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Asystent</translation>
+        <translation type="obsolete">Asystent</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Kierownik</translation>
+        <translation type="obsolete">Kierownik</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Wspolmalzonek</translation>
+        <translation type="obsolete">Wspolmalzonek</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Plec</translation>
+        <translation type="obsolete">Plec</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Urodziny</translation>
+        <translation type="obsolete">Urodziny</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Rocznica</translation>
+        <translation type="obsolete">Rocznica</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Przydomek</translation>
+        <translation type="obsolete">Przydomek</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Dzieci</translation>
+        <translation type="obsolete">Dzieci</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Tytul</translation>
+        <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Imie</translation>
+        <translation type="obsolete">Imie</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Drugie imie</translation>
+        <translation type="obsolete">Drugie imie</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Nazwisko</translation>
+        <translation type="obsolete">Nazwisko</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Tytul</translation>
+        <translation type="obsolete">Tytul</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Pokazuj jako</translation>
+        <translation type="obsolete">Pokazuj jako</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Stanowisko</translation>
+        <translation type="obsolete">Stanowisko</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Wydzial</translation>
+        <translation type="obsolete">Wydzial</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Firma</translation>
+        <translation type="obsolete">Firma</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Firma - ulica</translation>
+        <translation type="obsolete">Firma - ulica</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Firma - miasto</translation>
+        <translation type="obsolete">Firma - miasto</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Firma - region</translation>
+        <translation type="obsolete">Firma - region</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Firma - kod pocztowy</translation>
+        <translation type="obsolete">Firma - kod pocztowy</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Firma - kraj</translation>
+        <translation type="obsolete">Firma - kraj</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Firma - pager</translation>
+        <translation type="obsolete">Firma - pager</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Firma - strona WWW</translation>
+        <translation type="obsolete">Firma - strona WWW</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Dom - ulica</translation>
+        <translation type="obsolete">Dom - ulica</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Dom - miasto</translation>
+        <translation type="obsolete">Dom - miasto</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Dom - region</translation>
+        <translation type="obsolete">Dom - region</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Dom - kod pocztowy</translation>
+        <translation type="obsolete">Dom - kod pocztowy</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Dom - kraj</translation>
+        <translation type="obsolete">Dom - kraj</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Strona domowa</translation>
+        <translation type="obsolete">Strona domowa</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notatki</translation>
+        <translation type="obsolete">Notatki</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index db2bbda..2f89b64 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -242,96 +242,103 @@ na licencji GPL</translation>
     <message>
         <source>Error</source>
         <translation>Blad</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>Nie mozna usunac aktualnego folderu
 z zakladek.
 Nie ma go w zakladkach!</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Szukaj pliku</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>Czy na pewno usunac %1
 wraz z zawartoscia?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>Czy na pewno usunac
 %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>AdvancedFm ::</translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>kB wolne</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Przelacz na Widok 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Przelacz na widok 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Jeszcze niezaimplementowane</translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Zapisz wyjscie do pliku (tylko nazwa)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Wyjscie</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Proces nie mogl rozpoczac dzialania</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Blad</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>Skonczone</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Ustaw uprawnienia pliku</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Ustaw uprawnienia pliku dla:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>wlasciciel</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupa</translation>
     </message>
     <message>
         <source>others</source>
         <translation>pozostali</translation>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 07acb16..85ecc2e 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -38,109 +38,109 @@
         <translation>Styl zakladek:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zakladki</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Zakladki z ikonami</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Lista rozwijana</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista rozwijana z ikonami</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Gora</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Dol</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Styl</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Okna</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Restart</translation>
+        <translation type="obsolete">Restart</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Czy chcesz teraz zrestartowac %1?</translation>
+        <translation type="obsolete">Czy chcesz teraz zrestartowac %1?</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>Tak</translation>
+        <translation type="obsolete">Tak</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>Nie</translation>
+        <translation type="obsolete">Nie</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>Zapisz schemat</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Zapisz schemat</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Schemat juz istnieje.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Usun schemat</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Nie mozna usunac aktualnego schematu.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nowy&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Style okreslaja wyglad elementow takich jak przyciski i listwy przewijania w aplikacjach.
 
 Kliknij tu aby wybrac dostepny styl.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Kliknij tu aby skonfigurowac wybrany styl.
 
 Uwaga: Ta opcja jest niedostepna dla niektorych stylow.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Dekoracje okien okreslaja wyglad listwy tytulowej aplikacji i wyglad przyciskow na tej listwie.
 
 Kliknij tu aby wybrac dostepna dekoracje.</translation>
diff --git a/i18n/pl/calculator.ts b/i18n/pl/calculator.ts
index 5d99332..3f18d00 100644
--- a/i18n/pl/calculator.ts
+++ b/i18n/pl/calculator.ts
@@ -81,97 +81,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Kalkulator</translation>
+        <translation type="obsolete">Kalkulator</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standardowy</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Waga</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Odleglosc</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Powierzchnia</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatury</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Dzwiek</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>akry</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>karaty</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index a421c8d..06a0b2f 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -1,524 +1,754 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Rachunek</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nowy rachunek</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcje</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Wykresy</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Wpisz nazwe rachunku.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Wybierz typ rachunku.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Oszczednosci</translation>
+        <translation type="obsolete">Oszczednosci</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Czeki</translation>
+        <translation type="obsolete">Czeki</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Rynek finansowy</translation>
+        <translation type="obsolete">Rynek finansowy</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Wspolny fundusz</translation>
+        <translation type="obsolete">Wspolny fundusz</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Inne</translation>
+        <translation type="obsolete">Inne</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Bank:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Wpisz tu nazwe banku dla rachunku.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Numer konta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Wpisz tu numer konta dla rachunku.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Numer PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Wpisz tu numer PIN dla rachunku.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Bilans poczatkowy:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Wpisz tu poczatkowy bilans dla rachunku.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Wpisz tu dodatkowe informacje o tym rachunku.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Aktualny bilans: %10.00</translation>
+        <translation type="obsolete">Aktualny bilans: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Ten obszar pokazuje aktualny bilans tego rachunku.</translation>
+        <translation type="obsolete">Ten obszar pokazuje aktualny bilans tego rachunku.</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>To jest lista wszystkich transakcji przeprowadzonych na tym rachunku.
 
 By przesortowac wpisy wg pewnego pola, kliknij na nazwe kolumny.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Ilosc</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknij tu aby dodac nowa transakcje.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Wybierz transakcje, a nastepnie kliknij tu by ja edytowac.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Wybierz rachunek i kliknij tu aby go usunac.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Wybierz pozadany wykres ponizej i kliknij na przycisk Rysuj.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknij tu aby wyprac typ wykresu.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Bilans konta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Wyplaty wg kateorii</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Wplaty wg kategorii</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Rysuj</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Kliknij tu aby rysowac wybrany wykres.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Aktualny bilans: %1%2</translation>
+        <translation type="obsolete">Aktualny bilans: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Usun transakcje</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Ochrona hasla</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknij tu aby wlaczyc/wylaczyc ochrone tego rachunku haslem.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Nr</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Wpisz haslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosze wpisac swoje haslo:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potwierdz haslo</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prosze potwierdzic swoje haslo:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prosze wpisac swoje haslo aby potwierdzic zniesienie ochrony hasla:</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Bilans</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Konfiguruj rachunek</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Podaj symbol waluty:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Tu wpisz symbol swojej lokalnej waluty.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Pokaz czy rachunek jest chroniony
 haslem</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>Kliknij tu by zdecydowac, czy okno glowne ma pokazywac czy rachunek jest chroniony haslem.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Pokaz bilanse rachunkow</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknij tu by zdecydowac, czy okno glowne ma pokazywac aktualny bilans kazdego rachunku.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Usun</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Rachunek</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknij tu aby stworzyc nowy rachunek.
 
 Mozesz rowniez wybrac Nowy z menu Rachunek.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</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>Wybierz rachunek i kliknij tu aby go edytowac.
 
 Mozesz rowniez wybrac Edytuj z menu Rachunek albo kliknac i przytrzymac nazwe rachunku.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Wybierz rachunek i kliknij tu aby go usunac.
 
 Mozesz rowniez wybrac Usun z menu Rachunek.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To jest lista wszystkich aktualnie dostepnych rachunkow.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Usun rachunek</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfiguruj</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknij tu aby skonfigurowac ta aplikcaje.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nazwa rachunku</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Bilans</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosze podac swoje haslo:</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Edytuj</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Nowa</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Usun</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Oszczednosci</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Czeki</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Rynek finansowy</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Wspolny fundusz</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Inne</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Samochod</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Rachunki</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">Plyty CD</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Ubrania</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Komputer</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">Plyty DVD</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Elektronika</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Rozrywka</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Jedzenie</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Bezyna</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Rozne</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Filmy</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Czynsz</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Podroz</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Praca</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Czlonek rodziny</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Rozne</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcja na</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Wyplata</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Wybierz tu czy transakcja jest wycofaniem czy depozytem.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Wplata</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Tu wybierz date transakcji.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Numer:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Wpisz tu numer czeku.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Tu wpisz opis transakcji.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Wybierz tu kategorie transakcji.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Tu wybierz typ transakcji.
 
 Dostepnosc opcji jest uzalezniona od tego, czy transakcja jest depozytem, czy wycofaniem.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Ilosc:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Wpisz tu wielkosc transakcji.
 
 Wartosc ta powinna byc zawsze liczba dodatnia.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Prowizja:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Wpisz jakiekolwiek oplaty/prowizje zwiazana z ta transakcja.
 
 Wpisana wartosc powinna byc liczba dodatnia.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Wpisz tu dodatkowe informacje o transakcji.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Samochod</translation>
+        <translation type="obsolete">Samochod</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Rachunki</translation>
+        <translation type="obsolete">Rachunki</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>Plyty CD</translation>
+        <translation type="obsolete">Plyty CD</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Ubrania</translation>
+        <translation type="obsolete">Ubrania</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Komputer</translation>
+        <translation type="obsolete">Komputer</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>Plyty DVD</translation>
+        <translation type="obsolete">Plyty DVD</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Rozrywka</translation>
+        <translation type="obsolete">Rozrywka</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Jedzenie</translation>
+        <translation type="obsolete">Jedzenie</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Bezyna</translation>
+        <translation type="obsolete">Bezyna</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Rozne</translation>
+        <translation type="obsolete">Rozne</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Filmy</translation>
+        <translation type="obsolete">Filmy</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Czynsz</translation>
+        <translation type="obsolete">Czynsz</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Podroz</translation>
+        <translation type="obsolete">Podroz</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Karta platnicza</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Czek</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transfer</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Karta kredytowa</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Praca</translation>
+        <translation type="obsolete">Praca</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Czlonek rodziny</translation>
+        <translation type="obsolete">Czlonek rodziny</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Rozne</translation>
+        <translation type="obsolete">Rozne</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Automatyczna platnosc</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotowka</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Elektronika</translation>
+        <translation type="obsolete">Elektronika</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index e813507..a7324a6 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -105,96 +105,100 @@ Wyjsc ?</translation>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Poniedzialek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Wtorek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sroda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Czwartek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Piatek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Poczatek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edycja</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Emituj</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To jest zdarzenie calodniowe.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikuj</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -320,96 +324,104 @@ Wyjsc ?</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Poczatek-koniec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Domyslne</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokalizacja:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To jest zdarzenie calodniowe.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Sty-00. Sty</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Pn</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Wt</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Sr</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Czw</translation>
     </message>
     <message>
         <source>Fr</source>
         <comment>Friday</comment>
         <translation type="obsolete">Pt</translation>
     </message>
@@ -462,145 +474,145 @@ Wyjsc ?</translation>
         <source>End Time</source>
         <translation>Koniec</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>Nowe zdarzenie</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Lokalizacja</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Spotkanie</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Obiad</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Kolacja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Podroz</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Sty 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Poczatek</translation>
+        <translation type="unfinished">Poczatek</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Caly dzien</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Strefa czasowa</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation> minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Cicho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glosno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Powtarzaj</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Nie powtarzaj</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Poczatek - Koniec</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notatki...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Poczatek</translation>
+        <translation type="obsolete">Poczatek</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Informacje</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Edytuj notatke</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Obiad</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Poczatek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Koniec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 kazdy</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>%1 kazdy </translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 kazdego</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/pl/doctab.ts b/i18n/pl/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/pl/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/filebrowser.ts b/i18n/pl/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/pl/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/gsmtool.ts b/i18n/pl/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/pl/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/kate.ts b/i18n/pl/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/pl/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/kpacman.ts b/i18n/pl/kpacman.ts
index 1779a2a..e071b68 100644
--- a/i18n/pl/kpacman.ts
+++ b/i18n/pl/kpacman.ts
@@ -160,64 +160,68 @@ or is of an unknown format.</source>
     </message>
     <message>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>PORT NA QTOPIA: CATALIN CLIMOV</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>WCISNIJ KURSOR BY ZACZAC</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1UP</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>WYSOKI WYNIK</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2UP</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    GRATULACJE</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>   OSIAGNOLES</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation>PUNKTACJA W PIERWSZEJ 10.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>RNK   PUNKTY  IMIE   DATA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PAUZA</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
+    <message>
+        <source>                          </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation type="unfinished">Obrazek </translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Blad inicjalizacji</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/launchersettings.ts b/i18n/pl/launchersettings.ts
index d463456..02182cd 100644
--- a/i18n/pl/launchersettings.ts
+++ b/i18n/pl/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Ustawienia Launcher&apos;a</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Pasek zadan</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-Menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zakladki</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>W O-Menu laduj applety:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>W O-Menu pokazuj zakladki Launcher&apos;a</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Zaznacz applety, ktore maja byc umieszczone w O-Menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Dodaje zawartosc zakladek Launcher&apos;a jako menu w O-Menu.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Przyklad 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Przyklad 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Przyklad 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Edytuj zakladke</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Tlo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Czcionka</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Ikony</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>Podglad %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>To ogolny podglad tego jak bedzie wygladac aktualnie wybrana zakladka.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Uzyj wlasnej czcionki</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -106,103 +160,111 @@
         <source>Default</source>
         <translation>Domyslne</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Rozmiar:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Male</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Duze</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Kolor:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Zakladki Launcher&apos;a:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nowa</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Wlacz duzy wskaznik zajetosci</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Wlacz migajacy wskaznik zajetosci</translation>
+        <translation type="obsolete">Wlacz migajacy wskaznik zajetosci</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Wybierz zakladke, ktora chcesz edytowac lub usunac.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Dodaje nowa zakladke do Launcher&apos;a.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Otwiera okno z ustawieniami wybranej zakladki.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Usuwa zakladke.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Wybierz to, jesli chcesz miec duzy wskaznik zajetosci na srodku ekranu zamiast tego w pasku zadan.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Wybierz to, jasli chcesz aby ikonki uruchamianych aplikacji migaly przy starcie.</translation>
+        <translation type="obsolete">Wybierz to, jasli chcesz aby ikonki uruchamianych aplikacji migaly przy starcie.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Wszystkie zakladki</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Blad</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Nie zaimplementowane</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Applety do zaladowania w pasku zadan:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Zaznacz applety, ktore maja sie pokazywac w pasku zadan.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libclockapplet.ts b/i18n/pl/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/pl/libclockapplet.ts
+++ b/i18n/pl/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/pl/libfreetypefactory.ts b/i18n/pl/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libkeyview.ts b/i18n/pl/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/pl/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index c058ddf..e3fdee5 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Liquid</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Styl Liquid</translation>
+        <translation type="unfinished">Styl Liquid</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Bez przezroczystosci</translation>
+        <translation type="unfinished">Bez przezroczystosci</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Pasiasty, kolor tla</translation>
+        <translation type="unfinished">Pasiasty, kolor tla</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Pasiasty, kolor przycisku</translation>
+        <translation type="unfinished">Pasiasty, kolor przycisku</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Przezroczysty pasiasty, kolor tla</translation>
+        <translation type="unfinished">Przezroczysty pasiasty, kolor tla</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Przezroczysty pasiasty, kolor przycisku</translation>
+        <translation type="unfinished">Przezroczysty pasiasty, kolor przycisku</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Ustawiona przezroczystosc</translation>
+        <translation type="unfinished">Ustawiona przezroczystosc</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Kolor menu</translation>
+        <translation type="unfinished">Kolor menu</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Kolor tekstu</translation>
+        <translation type="unfinished">Kolor tekstu</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Nieprzezroczystosc</translation>
+        <translation type="unfinished">Nieprzezroczystosc</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Uzywaj cieniowanego tekstu menu</translation>
+        <translation type="unfinished">Uzywaj cieniowanego tekstu menu</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Plaskie przyciski na pasku narzedzi</translation>
+        <translation type="unfinished">Plaskie przyciski na pasku narzedzi</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Kontrast pasków</translation>
+        <translation type="unfinished">Kontrast pasków</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Liquid</translation>
+        <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Bardzo wydajny styl Liquid autorstwa Mosfet&apos;a</translation>
+        <translation type="unfinished">Bardzo wydajny styl Liquid autorstwa Mosfet&apos;a</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libmemoryapplet.ts b/i18n/pl/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/pl/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libmpeg3plugin.ts b/i18n/pl/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/liboapp.ts b/i18n/pl/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libopie.ts b/i18n/pl/libopie.ts
index e541d23..ee5057d 100644
--- a/i18n/pl/libopie.ts
+++ b/i18n/pl/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Przycisk Poczta</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Przycisk Dom</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Przycisk Zapis</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Obrot ekranu</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Czerwien:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Zielen:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Blekit:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Kanal alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Wybierz kolor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Wiecej</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Wiecej...</translation>
+        <translation type="obsolete">Wiecej...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otworz</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nazwa:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Typ Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Duze</translation>
@@ -364,96 +376,100 @@ i</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>tydzien(nie)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Powtarzaj co</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dzien</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>Mesiac(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Co</translation>
     </message>
     <message>
         <source>on </source>
         <translation>uzywajac</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Czas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Wybierz czas:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postep:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Koniec:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>Domyslny e-mail:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Biuro:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Firma - WWW:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Firma - telefon:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Firma - fax:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Firma - komorka:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Firma - pager:</translation>
     </message>
     <message>
@@ -581,79 +597,263 @@ i</translation>
         <translation>Niedziela</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Pliki</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Wszystkie pliki</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Bardzo wysoki</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Wysoki</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normalny</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niski</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Bardzo niski</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacja:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Zdarzenie calodniowe</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Zdarzenie wielodniowe</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres firmowy:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres firmowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>%1 %2 kazdego</translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopiecore2.ts b/i18n/pl/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/pl/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libopiedb2.ts b/i18n/pl/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libopiemm2.ts b/i18n/pl/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libopiepim2.ts b/i18n/pl/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libopieui2.ts b/i18n/pl/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libqdasher.ts b/i18n/pl/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/pl/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index 90d6472..024041f 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -818,109 +818,97 @@ Zwolnij wiecej pamieci</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Blad</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Blad</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pl/librestartapplet.ts b/i18n/pl/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/libtinykate.ts b/i18n/pl/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/pl/libtinykate.ts
+++ b/i18n/pl/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pl/libtodayaddressbookplugin.ts b/i18n/pl/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/pl/libtodayaddressbookplugin.ts
+++ b/i18n/pl/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libtodaydatebookplugin.ts b/i18n/pl/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/pl/libtodaydatebookplugin.ts
+++ b/i18n/pl/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pl/libtodaytodolistplugin.ts b/i18n/pl/libtodaytodolistplugin.ts
index b423a53..711d14e 100644
--- a/i18n/pl/libtodaytodolistplugin.ts
+++ b/i18n/pl/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/pl/libvtapplet.ts b/i18n/pl/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/pl/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/light-and-power.ts b/i18n/pl/light-and-power.ts
index ae98c69..24ca130 100644
--- a/i18n/pl/light-and-power.ts
+++ b/i18n/pl/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>Sensor swiatla ustawi poziom podswietlenia automatycznie</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Wylacz swiatlo po</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Przyciemnij swiatlo po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Zasnij po</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Wylacz</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on AC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished">Wylacz</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/mobilemsg.ts b/i18n/pl/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/pl/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/oipkg.ts b/i18n/pl/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/pl/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/op-qws.ts b/i18n/pl/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/pl/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/opie-login.ts b/i18n/pl/opie-login.ts
index ac1555a..5e024b4 100644
--- a/i18n/pl/opie-login.ts
+++ b/i18n/pl/opie-login.ts
@@ -6,82 +6,86 @@
 accurately to calibrate your screen.</source>
         <translation>Dotykaj krzyzykow mocno i dokladnie
 aby skalibrowac ekran.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Witamy w Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Witamy w OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Uzytkownik</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Haslo</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Uspij</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Restart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Wyjdz</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Zle haslo</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Podane haslo jest nieprawidlowe.</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Porazka</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Nie mozna przelaczyc na nowego uzytkownika</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie zostalo zamkniete
 przez nieprzechwycony sygnal
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Nie mozna uruchomic Opie.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/opierec.ts b/i18n/pl/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/pl/opierec.ts
+++ b/i18n/pl/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/ordesktop.ts b/i18n/pl/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/osearch.ts b/i18n/pl/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/pl/osearch.ts
+++ b/i18n/pl/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 3b2abf0..fc8e5d8 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished">Jezyk</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished">Czas i Data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished">Informacje Osobiste</translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">Problem z Aplikacja</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 nie odpowiada.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Czy chcesz wymusic zakonczenie aplikacji?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;&lt;p&gt;Szybkie ladowanie tej aplikacji zostalo wylaczone. Kliknij i przytrzymaj na ikonie aplikacji by je ponownie wlaczyc.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; zostalo zamkniete po otrzymaniu sygnalu %2&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished">Aplikacja zamknieta</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished">Aplikacja nie znaleziona</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;Nie mozna zlokalizowac aplikacji &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished">Blad</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;Nie mozna znalezc aplikacji %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
 </context>
@@ -110,218 +114,246 @@
         <translation type="unfinished">Unikod</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Launcher</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Brak aplikacji</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Brak aplikacji zdefiniowanych dla tego dokumentu.&lt;p&gt; Typ to %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">Dokumenty</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished">Pokaz jako tekst</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished">&lt;b&gt;Wyszukiwanie Dokumentow...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">Pokazuj ikony</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">Pokazuj liste</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>Document View</source>
         <translation type="unfinished">Widok Dokumentu</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished">Wszystkie typy</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished">Tryb bezpieczny</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished">Menadzer wtyczek...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished">Restartuj Qtopie</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished">Pomoc...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informacje</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Data systemowa wydaje sie byc nieprawidlowa.
 (%1)&lt;/p&gt;&lt;p&gt;Czy chcesz poprawic zegar?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">Poziom energii jest krytyczny!
+        <translation type="obsolete">Poziom energii jest krytyczny!
 Wylacz urzadzenie az do naladowania baterii!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
-        <translation type="unfinished">Poziom energii bardzo niski.</translation>
+        <translation type="obsolete">Poziom energii bardzo niski.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">Bateria zapasowa sie rozladowuje.
+        <translation type="obsolete">Bateria zapasowa sie rozladowuje.
 Doladuj baterie zapasowa.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">wizytowka</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished">Tryb Bezpieczny</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished">&lt;P&gt;Wystapil blad systemu i jest on teraz w Trybie Bezpiecznym. W tym trybie nie sa ladowane wtyczki. Uzywajac Menadzera Wtyczek mozesz wylaczyc wtyczki, ktore powoduja awarie systemu.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished">OK</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished">Menadzer Wtyczek...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished">Stan Pamieci</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished">Malo Pamieci
 Zapisz dane.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished">Krytyczny Brak Pamieci
 Zakoncz natychmiast 
 ta aplikacje.</translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">Zamknij</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">Zamknij Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">Restartuj system</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">Restartuj Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">Zamknij system</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 Te opcje zamykajace zostaly pierwotnie dodane do uzytku deweloperow i dla testow Opie. W normalnym srodowisku ich uzywanie nie jest konieczne.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Zamykanie systemu...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Polaczenie Synchronizacyjne</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;Nieautoryzowany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli uzywasz Qtopia Desktop w wersji wczesniejszej niz 1.5.1, zaktualizuj ja.</translation>
+        <translation type="obsolete">&lt;p&gt;Nieautoryzowany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli uzywasz Qtopia Desktop w wersji wczesniejszej niz 1.5.1, zaktualizuj ja.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Odmow</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Nierozpoznany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli zainicjowales Synchronizacje po raz pierwszy  to jest to normalne.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Zezwol</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation type="unfinished">Przerwij</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished">Synchronizacja:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/quicklauncher.ts b/i18n/pl/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 26bc42b..25d7db7 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Ustaw haslo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Podaj haslo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Haslo bledne</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Haslo nieprawidlowe.
 Dostep zabroniony</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Kazdy</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Wpisz nowe haslo</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Powtorz nowe haslo</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Ustawienia bezpieczenstwa</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zmien haslo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Wyczysc haslo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Wymaj hasla po uruchomieniu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronizuj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Akceptuj synchronizacje z sieci:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Kazdy</translation>
+        <translation type="obsolete">Kazdy</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Brak</translation>
+        <translation type="obsolete">Brak</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Haslo zabezpieczajace pozwala na minimalny poziom zabezpieczen do tego urzadzenia.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (domyslny)</translation>
+        <translation type="obsolete">192.168.129.0/24 (domyslny)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Haslo</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Loguj automatycznie</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/sound.ts b/i18n/pl/sound.ts
index 365190a..4dc5e1c 100644
--- a/i18n/pl/sound.ts
+++ b/i18n/pl/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Probkowanie:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Katalog Nagrania:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Przycisk Nagrywania:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Limit Nagrania w sekundach:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Nielimitowane</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Restartuj Opie w razie potrzeby</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/sysinfo.ts b/i18n/pl/sysinfo.ts
index 1d50f1c..302e58e 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -50,104 +50,118 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uzycie procesora przez aplikacje (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uzycie procesora przez system (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Ta strona prezentuje obciazenie procesora tego urzadzenia.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uzywana (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Bufory (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Podreczna (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Wolna (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Calkowita Pamiec: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Ta strona prezentuje alokacje pamieci (np. RAM) na Twoim urzadzeniu.
+        <translation type="obsolete">Ta strona prezentuje alokacje pamieci (np. RAM) na Twoim urzadzeniu.
 Pamiec jest podzielona na kategorie:
 
 1. Uzywana - pamiec uzywana przez Opie i inne dzialajace aplikacje.
 2. Bufory - tymczasowa przestrzen uzywana do poprawienia wydajnosci.
 3. Podreczna - informacje, ktore zostaly juz uzyte, ale nie zostaly jeszcze zwolnione.
 4. Wolna - pamiec nie bedaca aktualnie w uzyciu przez zadne aplikacje.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Rozmiar</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uzyty#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>To jest lista wszystkich aktualnie zaladowanych modulow jadra.
 
 Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub wy go usunac z pamieci.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Wybierz tu polecenie i kliknij przycisk Wyslij po prawej zeby wyslac polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Kliknij tu zeby wyslac wybrane polecenie do wybranego powyzej modulu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym module.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Uzywany przez</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation>Czy na pewno chcesz wykonac %1 na tym module?</translation>
     </message>
 </context>
@@ -165,118 +179,131 @@ Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>polecenie</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>To jest lista wszystkich procesow dzialajacych na tym urzadzeniu.
 
 Kliknij i przytrzymaj na procesie by zobaczyc dodatkowe informacje o nim lub by wyslac do niego sygnal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Wybierz tu sygnal i kliknij przycisk Wyslij po prawej by go wyslac do procesu.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Wyslij</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Kliknij tu by wyslac wybrany sygnal do tego procesu.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Ten obszar prezentuje szczegolowe informacje o tym procesie.</translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>Czy na pewno chcesz wyslac %1 do tego procesu?</translation>
+        <translation type="obsolete">Czy na pewno chcesz wyslac %1 do tego procesu?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacja o systemie</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Pamiec</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Dyski</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>Procesor</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Procesy</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Wersja</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduly</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Jadro Linuksa&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Kompilowane przez: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Wersja: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zbudowane na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Wersja:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Model:</translation>
+        <translation type="obsolete">&lt;p&gt;Model:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Sprzedawca:</translation>
+        <translation type="obsolete">&lt;p&gt;Sprzedawca:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Ta strona prezentuje aktualne wersje Opie, jadra Linuksa i dystrybucji dzialajacych na tym urzadzeniu.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pl/taboapp.ts b/i18n/pl/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pl/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pl/tictac.ts b/i18n/pl/tictac.ts
index 5fdf435..ddd631f 100644
--- a/i18n/pl/tictac.ts
+++ b/i18n/pl/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>TicTac</translation>
+        <translation type="obsolete">TicTac</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Komputer pierwszy</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Czlowiek pierwszy</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Graj!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Wyjdz</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Wcisnij Graj do startu</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Wykonaj ruch</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Wygrales!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Komputer wygral!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Remis</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 0a99604..224e885 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Dzisiaj</translation>
+        <translation type="obsolete">Dzisiaj</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Wypelnij wizytowke</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Nie znaleziono zadnych wtyczek</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Brak aktywnych wtyczek</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Kliknij tu zeby uruchomic powiazana aplikacje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Wlasciciel</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Dzisiaj</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Kliknij tu zeby wyswietlic okno konfiguracyjne</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Ktore wtyczki i w jakiej kolejnosci ladowac:</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>Do Gory</translation>
     </message>
     <message>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index edf0fcc..adcbf1a 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -173,97 +173,97 @@ Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Program nie byl w stanie
 zapisac zmian.
 Zwolnij troche pamieci
 i sprobuj ponownie.
 
 Wyjsc mimo to?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>ZrobTo</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>wszystkie zadania?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>wszystkie ukonczone zadania?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>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>&lt;P&gt;Przybylo %1 nowych zadan.&lt;p&gt; Czy chcesz dodac je do swojej listy ZrobTo?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nowe Zadania</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplikuj</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorytet</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Termin koncowy</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Konfiguruj szablony</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Edytor szablonow</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Nowy Szablon %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu zeby ustawic priorytet nowego zadania.
 
 Ten obszar nazywa sie szybkim paskiem zadan.
 
 Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
@@ -291,96 +291,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu zeby wpisac dodatkowe informacje dla nowego zadania.
 
 Ten obszar nazywa sie szybkim paskiem zadan.
 
 Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wpisz</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu zeby dodac zadanie.
 
 Ten obszar nazywa sie szybkim paskiem zadan.
 
 Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Kliknij tu zeby wyczyscic informacje o nowym zadaniu.
 
 Ten obszar nazywa sie szybkim paskiem zadan.
 
 Dzieki niemu mozesz szybko dodac zadanie do listy. Moze on byc pokazany lub ukryty przez wybranie Opcje-&gt;&apos;Pokaz szybki pasek zadan&apos; z powyzszego menu.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Dane nie mogo byc zmienione, trwa synchronizacja</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Dane nie mogo byc zmienione, trwa synchronizacja</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Widok Tabeli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dni</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Nowe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usun</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Czas</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
diff --git a/i18n/pl/tonleiter.ts b/i18n/pl/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/pl/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pl/zsafe.ts b/i18n/pl/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/pl/zsafe.ts
+++ b/i18n/pl/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index e20389c..63b6d4a 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -1303,212 +1303,212 @@ todos os dispositivos!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Territórios Ocupados Palestinianos</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Escolha para introduzir o ultimo, do meio e primeiro nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Introduza o nome completo directamente. Se tiver um apelido com várias palavras (por exemplo, &quot;da Silva&quot;), escreva &lt;apelido&gt;,&lt;nomes&gt; tal como: &quot;da Silva, Rosa Margarida&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>O título (emprego)..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Exemplo: &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>O local de trabalho do contacto</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Use para escolher o atributo a mudar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Use para escolher o formato para gravar o nome e mostrar na lista</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Telefone (Empresa)</translation>
+        <translation type="obsolete">Telefone (Empresa)</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax (Empresa)</translation>
+        <translation type="obsolete">Fax (Empresa)</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Telemóvel (Empresa)</translation>
+        <translation type="obsolete">Telemóvel (Empresa)</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>EMail Principal</translation>
+        <translation type="obsolete">EMail Principal</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Outros EMails</translation>
+        <translation type="obsolete">Outros EMails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Telefone (Pessoal)</translation>
+        <translation type="obsolete">Telefone (Pessoal)</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax (Pessoal)</translation>
+        <translation type="obsolete">Fax (Pessoal)</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Telemóvel (Pessoal)</translation>
+        <translation type="obsolete">Telemóvel (Pessoal)</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Escritório</translation>
+        <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profissão</translation>
+        <translation type="obsolete">Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistente</translation>
+        <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Chefe</translation>
+        <translation type="obsolete">Chefe</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Esposa</translation>
+        <translation type="obsolete">Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sexo</translation>
+        <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Nascimento</translation>
+        <translation type="obsolete">Nascimento</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Aniversário</translation>
+        <translation type="obsolete">Aniversário</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Alcunha</translation>
+        <translation type="obsolete">Alcunha</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Filhos</translation>
+        <translation type="obsolete">Filhos</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Nome do Meio</translation>
+        <translation type="obsolete">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Apelido</translation>
+        <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Sufixo</translation>
+        <translation type="obsolete">Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Gravar Como</translation>
+        <translation type="obsolete">Gravar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Título Profissional</translation>
+        <translation type="obsolete">Título Profissional</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Departamento</translation>
+        <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Empresa</translation>
+        <translation type="obsolete">Empresa</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Rua (Empresa)</translation>
+        <translation type="obsolete">Rua (Empresa)</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Cidade (Empresa)</translation>
+        <translation type="obsolete">Cidade (Empresa)</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Estado (Empresa)</translation>
+        <translation type="obsolete">Estado (Empresa)</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Cód. Postal (Empresa)</translation>
+        <translation type="obsolete">Cód. Postal (Empresa)</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>País (Empresa)</translation>
+        <translation type="obsolete">País (Empresa)</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Pager (Empresa)</translation>
+        <translation type="obsolete">Pager (Empresa)</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>WebSite (Empresa)</translation>
+        <translation type="obsolete">WebSite (Empresa)</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Rua (Pessoal)</translation>
+        <translation type="obsolete">Rua (Pessoal)</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Cidade (Pessoal)</translation>
+        <translation type="obsolete">Cidade (Pessoal)</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Estado (Pessoal)</translation>
+        <translation type="obsolete">Estado (Pessoal)</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Cód. Postal (Pessoal)</translation>
+        <translation type="obsolete">Cód. Postal (Pessoal)</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>País (Pessoal)</translation>
+        <translation type="obsolete">País (Pessoal)</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>WebSite (Pessoal)</translation>
+        <translation type="obsolete">WebSite (Pessoal)</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index 38d212b..36b3a53 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -249,96 +249,103 @@ Não existe na lista!</translation>
         <source>File Search</source>
         <translation>Procurar Ficheiro</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>Apagar mesmo
 os ficheiros %1
 e os seus conteúdos?</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>Apagar mesmo
 %1?</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>Gestor de Ficheiros ::</translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>KB livres</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">Copiar &apos;%1&apos; Como</translation>
     </message>
     <message>
         <source>Copy </source>
         <translation>Copiar</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Mudar para a Vista 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Mudar para a Vista 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Ainda Não Implementado</translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Gravar resultado no ficheiro (apenas nome)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Resultado</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>Não foi possível iniciar o processo</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>Erro
 </translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>
 Terminado
 </translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Alterar Permissões do Ficheiro</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Alterar Permissões do Ficheiro para:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>utilizador</translation>
     </message>
     <message>
         <source>group</source>
         <translation>grupo</translation>
     </message>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index e6ef222..7d2c541 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -38,109 +38,109 @@
         <translation>Estilo da Pasta:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pastas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Pastas c/icones</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Lista</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Lista com icones</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Em Cima</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Em Baixo</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Estilo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Janelas</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avançadas</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>Reiniciar</translation>
+        <translation type="obsolete">Reiniciar</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>Deseja reiniciar %1 agora?</translation>
+        <translation type="obsolete">Deseja reiniciar %1 agora?</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>Save Scheme</source>
         <translation>Gravar Esquema</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Gravar esquema</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>O esquema já existe.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Apagar esquema</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>O esquema actual não pode ser apagado.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;novo&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Os estilos controlam a forma com que serão desenhados os botões e as barras de deslize das aplicações.
 
 Clique aqui para escolher um estilo.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Clique aqui para configurar o estilo actual.
 
 Nota: esta opção não está disponível em todos os estilos.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>A decoração das janelas controla a forma com que serão desenhadas a barra do título e respectivos botões.
 
 Clique aqui para escolher uma decoração.</translation>
diff --git a/i18n/pt/calculator.ts b/i18n/pt/calculator.ts
index 9135667..14e5a45 100644
--- a/i18n/pt/calculator.ts
+++ b/i18n/pt/calculator.ts
@@ -81,97 +81,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Calculadora</translation>
+        <translation type="obsolete">Calculadora</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Simples</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Simples</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distancia</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>ºC</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>caracs</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index 6ab7630..d774404 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -1,524 +1,754 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Despesas</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova despesa</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transações</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Gráficos</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Introduza o nome da despesa aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Escolha o tipo de despesa aqui.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Poupanças</translation>
+        <translation type="obsolete">Poupanças</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Cheques</translation>
+        <translation type="obsolete">Cheques</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Mercado Monetário</translation>
+        <translation type="obsolete">Mercado Monetário</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Fundos Mútuos</translation>
+        <translation type="obsolete">Fundos Mútuos</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Outro</translation>
+        <translation type="obsolete">Outro</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banco:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Introduza o nome do banco para esta despesa.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Número de Conta:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Introduza o número de conta para esta despesa.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Número PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Introduza o PIN para esta despesa.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Saldo Inicial:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Introduza o saldo inicial para esta lista de despesas.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Introduza informação adicional para esta lista de despesas.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Saldo Actual: %10.00</translation>
+        <translation type="obsolete">Saldo Actual: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Aqui poderá ver o saldo actual desta lista de despesas.</translation>
+        <translation type="obsolete">Aqui poderá ver o saldo actual desta lista de despesas.</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>Aqui poderá ver a lista de todas as transações introduzidas para esta lista de despesas.
 
 Para ordenar por um campo específico, clique no nome da coluna.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Valor</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Clique aqui para adicionar uma transação.</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 uma transação e clique aqui para a editar.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Seleccione uma transação e clique aqui para a apagar.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Seleccione o gráfico pretendido e clique no botão &quot;Gráfico&quot;.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Clique aqui para escolher o gráfico desejado.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Saldo da Conta</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Levantamentos por categoria</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Depósitos por categoria</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Gráfico</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Clique aqui para desenhar o gráfico seleccionado.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Saldo actual: %1%2</translation>
+        <translation type="obsolete">Saldo actual: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Apagar transação</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Proteger por palavra chave</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Clique aqui para activar/desactivar a protecção por palavra chave.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Num</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Introduza a sua palavra chave:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Confirme palavra chave</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Confirme a sua palavra chave:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Introduza a sua palavra chave para desactivar a protecção:</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Saldo</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Configurar Despesas</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Introduza o símbolo monetário:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Introduza o símbolo monetário aqui.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Mostra se as despesas estão protegidas 
 por palavra chave ou não</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>Clique aqui para selecionar se a janela principal irá mostrar se as despesas estão protegidas por palavra chave.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Mostrar saldos das despesas</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Clique aqui para selecionar se a janela principal irá mostrar o saldo actual de cada lista de despesas.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Apagar</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Despesas</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Clique aqui para criar uma nova lista de despesas.
 
 Também pode escolher &quot;Novo&quot; no menu.</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 uma lista de despesas e clique aqui para a editar.
 
 Também pode escolher &quot;Edit&quot; no menu, ou clicar e esperar num nome.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Clique aqui para apagar uma nova lista de despesas.
 
 Também pode escolher &quot;Apagar&quot; no menu.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>Está é a lista de todas as listas de despesas disponíveis.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Apagar lista de despesas</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurar</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Clique aqui para a configuração.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Nome da Despesa</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Saldo</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Introduza palavra chave</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Introduza a sua palavra chave:</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Data</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Editar</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Novo</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Apagar</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Poupanças</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Cheques</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Mercado Monetário</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Fundos Mútuos</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Outro</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Automóvel</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Contas</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDs</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Roupa</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Informática</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDs</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished">Electrónico</translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Entretenimento</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Comida</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Combustível</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Vários</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Filmes</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Rendas</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Viagens</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Vencimento</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Despesas Familiares</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Créditos Diversos</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transação para</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Levantamento</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Seleccione se a transação é um levantamento ou um depósito aqui.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Depósito</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Data:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Seleccione a data da transação aqui.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Introduza o número do cheque aqui.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Introduza a descrição da transação aqui.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Seleccione a categoria da transação aqui.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Seleccione o tipo de transação aqui.
 
 As opções são dependentes da transação ser de levantamento ou de depósito.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Valor:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Introduza o valor da transação aqui.
 
 O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Taxa:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Introduza a taxa associada à transação.
 
 O valor deverá ser sempre positivo.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notas:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Introduza informação adicional para esta transação aqui.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Automóvel</translation>
+        <translation type="obsolete">Automóvel</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Contas</translation>
+        <translation type="obsolete">Contas</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDs</translation>
+        <translation type="obsolete">CDs</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Roupa</translation>
+        <translation type="obsolete">Roupa</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Informática</translation>
+        <translation type="obsolete">Informática</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDs</translation>
+        <translation type="obsolete">DVDs</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Electrónica</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Entretenimento</translation>
+        <translation type="obsolete">Entretenimento</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Comida</translation>
+        <translation type="obsolete">Comida</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Combustível</translation>
+        <translation type="obsolete">Combustível</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Vários</translation>
+        <translation type="obsolete">Vários</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Filmes</translation>
+        <translation type="obsolete">Filmes</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Rendas</translation>
+        <translation type="obsolete">Rendas</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Viagens</translation>
+        <translation type="obsolete">Viagens</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Taxa de Débito</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Cheque</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transferência</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Cartão de Crédito</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Vencimento</translation>
+        <translation type="obsolete">Vencimento</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Despesas Familiares</translation>
+        <translation type="obsolete">Despesas Familiares</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Créditos Diversos</translation>
+        <translation type="obsolete">Créditos Diversos</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Pagamento Automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Dinheiro</translation>
     </message>
     <message>
         <source>Electronics</source>
-        <translation>Electrónico</translation>
+        <translation type="obsolete">Electrónico</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index a9e9b87..de8a2ba 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -105,96 +105,100 @@ Sair na mesma?</translation>
     <message>
         <source>M</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Te</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Qu</translation>
     </message>
     <message>
         <source>F</source>
         <translation>Se</translation>
     </message>
     <message>
         <source>S</source>
         <translation>Sá</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicado</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -324,97 +328,97 @@ Sair na mesma?</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Morada:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>O evento dura o dia todo.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">STQQSSDS</translation>
+        <translation type="unfinished">STQQSSDS</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>w</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">Se</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">Te</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">Qu</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Qu</translation>
     </message>
     <message>
         <source>Fr</source>
@@ -478,137 +482,137 @@ Sair na mesma?</translation>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Morada</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>Reunião</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>Almoço</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>Jantar</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escritório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Casa</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Hora Início</translation>
+        <translation type="unfinished">Hora Início</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Todo o dia</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Fuso horário</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarme</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minutos</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencioso</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Sem repetição...</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Hora Início</translation>
+        <translation type="obsolete">Hora Início</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Informação</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos os %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Todos os %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>Todos os %1 %1</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/pt/doctab.ts b/i18n/pt/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/pt/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/filebrowser.ts b/i18n/pt/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/pt/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/gsmtool.ts b/i18n/pt/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/pt/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/kate.ts b/i18n/pt/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/pt/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/kpacman.ts b/i18n/pt/kpacman.ts
index 0a8fa97..4f6cd06 100644
--- a/i18n/pt/kpacman.ts
+++ b/i18n/pt/kpacman.ts
@@ -178,69 +178,69 @@ tem um formato desconhecido.</translation>
         <source>QTOPIA PORT: CATALIN CLIMOV</source>
         <translation>Adaptação para o Opie: Catalin Climov</translation>
     </message>
     <message>
         <source>PRESS CURSOR TO START</source>
         <translation>Prima a tecla de cursor para começar</translation>
     </message>
 </context>
 <context>
     <name>Score</name>
     <message>
         <source>  1UP </source>
         <translation>1 JOGADOR</translation>
     </message>
     <message>
         <source> HIGH SCORE </source>
         <translation>MELHOR PONTUAÇÃO</translation>
     </message>
     <message>
         <source>  2UP </source>
         <translation>2 JOGADORES</translation>
     </message>
     <message>
         <source>     CONGRATULATIONS      </source>
         <translation>    PARABÉNS</translation>
     </message>
     <message>
         <source>    YOU HAVE ARCHIEVED    </source>
         <translation>    CONSEGUIU ATINGIR</translation>
     </message>
     <message>
         <source>  A SCORE IN THE TOP 10.  </source>
         <translation> UMA PONTUAÇÃO NOS DEZ MELHORES.</translation>
     </message>
     <message>
         <source>RNK   SCORE  NAME   DATE</source>
         <translation>POS   PONTU  NOME   DATA</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>PARADO</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@YY@/@MM@/@DD@</translation>
     </message>
     <message>
         <source>                          </source>
-        <translation>                          </translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Status</name>
     <message>
         <source>The pixmap could not be contructed.
 
 The file &apos;@PIXMAPNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Não foi possível usar o gráfico necessário.
 
 O ficheiro &apos;@PIXMAPNAME@&apos; não existe ou
 tem um formato desconhecido.</translation>
     </message>
     <message>
         <source>Initialization Error</source>
         <translation>Erro ao iniciar</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/launchersettings.ts b/i18n/pt/launchersettings.ts
index 15a58ea..8a3a145 100644
--- a/i18n/pt/launchersettings.ts
+++ b/i18n/pt/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Configurações da Lista de Aplicações</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Barra Principal</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>Menu Principal</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pastas</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Ler aplicações especiais no menu principal:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Mostrar pastas de aplicações no menu principal</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Seleccione as aplicações especiais que quer incluidas no menu principal.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Adiciona as pastas de aplicações ao menu principal.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Exemplo 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>Exemplo 2</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>Exemplo 3</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Editar Pasta</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Fundo</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Fonte</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Icones</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>A mostrar previsão %1</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>Esta é uma precisão simples do formato de pastas seleccionado.</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>Usar uma fonte personalizada</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -106,103 +160,111 @@
         <source>Default</source>
         <translation>Omissão</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Tamanho:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Pequena</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Cor:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Pastas de Aplicações:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Activar indicador grande ao iniciar uma aplicação</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Activar indicador a piscar ao iniciar uma aplicação</translation>
+        <translation type="obsolete">Activar indicador a piscar ao iniciar uma aplicação</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Seleccione a pasta de aplicações que quer editar ou apagar.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Adiciona uma nova pasta à lista de aplicações.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Abre uma nova janela para personalizar a pasta seleccionada.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Apagar a pasta da lista de aplicações.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Active esta opção se quiser um indicador grande no meio do ecrâ em vez de um na barra principal.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Active esta opção se quiser um indicador a piscar ao iniciar aplicações.</translation>
+        <translation type="obsolete">Active esta opção se quiser um indicador a piscar ao iniciar aplicações.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Todas as Pastas</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Por implementar</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Carregar aplicações especiais na barra principal:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Seleccione as aplicações especiais que deseja ver na barra principal.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libfreetypefactory.ts b/i18n/pt/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 8794708..00d5dfd 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -1,75 +1,75 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Decoration</name>
     <message>
         <source>Liquid</source>
         <translation type="obsolete">Líquido</translation>
     </message>
 </context>
 <context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Estilo Líquido</translation>
+        <translation type="unfinished">Estilo Líquido</translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Sem transparências</translation>
+        <translation type="unfinished">Sem transparências</translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Tracejado, cor do fundo</translation>
+        <translation type="unfinished">Tracejado, cor do fundo</translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Tracejado, cor dos botões</translation>
+        <translation type="unfinished">Tracejado, cor dos botões</translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Tracejado transparente, cor do fundo</translation>
+        <translation type="unfinished">Tracejado transparente, cor do fundo</translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Tracejado transparente, cor do botão</translation>
+        <translation type="unfinished">Tracejado transparente, cor do botão</translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Configurar transparência</translation>
+        <translation type="unfinished">Configurar transparência</translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Cor do menu</translation>
+        <translation type="unfinished">Cor do menu</translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Cor do texto</translation>
+        <translation type="unfinished">Cor do texto</translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Opacidade</translation>
+        <translation type="unfinished">Opacidade</translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Usar sombras no texto do menu</translation>
+        <translation type="unfinished">Usar sombras no texto do menu</translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Botões planos na barra de ferramentas</translation>
+        <translation type="unfinished">Botões planos na barra de ferramentas</translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Contraste do tracejado</translation>
+        <translation type="unfinished">Contraste do tracejado</translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Líquido</translation>
+        <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Estilo Líquido por Mosfet</translation>
+        <translation type="unfinished">Estilo Líquido por Mosfet</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libmemoryapplet.ts b/i18n/pt/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/pt/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libmpeg3plugin.ts b/i18n/pt/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/liboapp.ts b/i18n/pt/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libopie.ts b/i18n/pt/libopie.ts
index eb3b368..8d96d73 100644
--- a/i18n/pt/libopie.ts
+++ b/i18n/pt/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Botão do E-Mail</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Botão do Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Botão de Gravação</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Mostrar Rodar</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Em Baixo+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Em Baixo+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Em Baixo+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Em Baixo+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Em Cima+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Em Cima+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Em Cima+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Em Cima+Esquerda</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Cor:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Vermelho:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Escolha cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Mais</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Mais...</translation>
+        <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DiálogoFicheiro</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Tipo de Conteúdo</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
@@ -364,102 +376,106 @@ e</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repetir Por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>on </source>
         <translation>em</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha Hora:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">Descrição:</translation>
+        <translation type="unfinished">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-Mail por Omissão:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Endereço Trabalho:&lt;/b&gt; </translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Emprego:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Site Web Emprego:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Emprego:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Emprego:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Telemóvel Emprego:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Emprego:</translation>
@@ -597,79 +613,259 @@ e</translation>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheiros</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos os Ficheiros</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Este é um evento para o dia todo</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Este é um evento para vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (emprego):&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (emprego):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (pessoal):&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço (pessoal):&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>Todos os %1 %2</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation></translation>
     </message>
     <message>
         <source>nd</source>
         <translation></translation>
     </message>
     <message>
         <source>rd</source>
         <translation></translation>
     </message>
     <message>
         <source>th</source>
         <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopiecore2.ts b/i18n/pt/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/pt/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libopiedb2.ts b/i18n/pt/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libopiemm2.ts b/i18n/pt/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libopiepim2.ts b/i18n/pt/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libopieui2.ts b/i18n/pt/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libqdasher.ts b/i18n/pt/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/pt/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index b85eaaf..c1928b6 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -818,109 +818,109 @@ novamente.</translation>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Set</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Erro</translation>
+        <translation type="obsolete">Erro</translation>
     </message>
     <message>
         <source>Could not find the application </source>
-        <translation>Não foi possível encontrar a aplicação</translation>
+        <translation type="obsolete">Não foi possível encontrar a aplicação</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation type="obsolete">Ok</translation>
     </message>
     <message>
         <source>Could not start the application </source>
-        <translation>Não foi possível iniciar a aplicação</translation>
+        <translation type="obsolete">Não foi possível iniciar a aplicação</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>documento %1</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt/librestartapplet.ts b/i18n/pt/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/libtinykate.ts b/i18n/pt/libtinykate.ts
index c199090..79f42d1 100644
--- a/i18n/pt/libtinykate.ts
+++ b/i18n/pt/libtinykate.ts
@@ -1,22 +1,975 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Ocorreu um problema ao criar
 a configuração deste programa.
 
 Liberte algum espaço e tente 
 novamente.</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt/libtodayaddressbookplugin.ts b/i18n/pt/libtodayaddressbookplugin.ts
index f064a0f..7575032 100644
--- a/i18n/pt/libtodayaddressbookplugin.ts
+++ b/i18n/pt/libtodayaddressbookplugin.ts
@@ -1,94 +1,114 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Máximo de Linhas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Altera o número máximo de linhas a mostrar para cada aniversário ou nascimento</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>Cortar a linha ao fim de X caracteres:</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Cortar a linha ao fim de quantos caractéres</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>Dias no futuro:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Quantos dias no futuro deverão ser procurados</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Para activar as alterações reinicie a aplicação!</translation>
+        <translation type="unfinished">Para activar as alterações reinicie a aplicação!</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Mudar a cor da linha de cabeçalho:</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>Cores dos cabeçalhos!</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>Mudar a Cor da Entrada:</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>Esta cor será usada para mostrar nascimentos e aniversários!</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>Mostrar a cor
 urgente se abaixo</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>dias:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Esta cor urgente será usada se estiver perto de um evento!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Esta cor urgente será usada se estiver a menos de x dias de um nascimento ou aniversário!</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>Extra de Contactos</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Nascimentos nos próximos &lt;b&gt;%1&lt;/b&gt; dias:</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nenhum nascimento nos próximos &lt;b&gt;%1&lt;/b&gt; dias!</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>Aniversários nos próximos &lt;b&gt;%1&lt;/b&gt; dias:</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>Nenhum aniversário nos próximos &lt;b&gt;%1&lt;/b&gt; dias!</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>Não foi possível aceder à base de dados. Actualize a biblioteca do Opie!&lt;br&gt;</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libvtapplet.ts b/i18n/pt/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/pt/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/light-and-power.ts b/i18n/pt/light-and-power.ts
index 03b6e12..da1592c 100644
--- a/i18n/pt/light-and-power.ts
+++ b/i18n/pt/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 Níveis</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>A luz do ecrâ será ajustada automaticamente mediante a luz ambiente. O parametro do brilho afectará o brilho médio.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Reduzir brilho ao fim de</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Suspender ao fim de</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Desligar luz ao fim de</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Desligar</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>Configurações de Luz e Energia</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>em Bateria</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>Configurações Gerais</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>seg</translation>
     </message>
     <message>
         <source>never</source>
         <translation>nunca</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>Apenas desactivar o ecrâ (não desligar)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>Luz</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation>Usar o sensor de Luz</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>Calibrar</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>Configurações avançadas para o sensor de luz</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>ligado à corrente</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>Avisos</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>Intervalo de aviso de bateria baixa</translation>
     </message>
     <message>
         <source> %</source>
         <translation>%</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>Qual o nível de energia da bateria para que seja avisado</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>qual o intervalo para verificar a carga da bateria. Este valor determina também o intervalo dos avisos</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>Qual o nível crítico de energia da bateria para que seja avisado</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>bateria baixa aos</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>bateria crítica aos</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>Calibração do Sensor</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>Máximo</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Desligado</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>Escuro</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>Claro</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>Níveis</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>Intervalo</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>seg</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/mobilemsg.ts b/i18n/pt/mobilemsg.ts
index 288257a..bf9588c 100644
--- a/i18n/pt/mobilemsg.ts
+++ b/i18n/pt/mobilemsg.ts
@@ -1,72 +1,88 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MobileMsg</name>
     <message>
         <source>Messages: </source>
-        <translation>Mensagens:</translation>
+        <translation type="obsolete">Mensagens:</translation>
     </message>
 </context>
 <context>
     <name>MobileMsgBase</name>
     <message>
         <source>Mobile Messaging</source>
         <translation>Mensagens Móveis</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Número:</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Text</source>
-        <translation>Texto</translation>
+        <translation type="obsolete">Texto</translation>
     </message>
     <message>
         <source>Flash</source>
         <translation>Flash</translation>
     </message>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
     <message>
         <source>SMS: %1</source>
-        <translation>SMS: %1</translation>
+        <translation type="obsolete">SMS: %1</translation>
     </message>
     <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
         <source>Country:</source>
-        <translation>País:</translation>
+        <translation type="obsolete">País:</translation>
     </message>
     <message>
         <source>Logo</source>
-        <translation>Logo</translation>
+        <translation type="obsolete">Logo</translation>
     </message>
     <message>
         <source>Group</source>
-        <translation>Grupo</translation>
+        <translation type="obsolete">Grupo</translation>
     </message>
     <message>
         <source>Picture</source>
-        <translation>Imagem</translation>
+        <translation type="obsolete">Imagem</translation>
     </message>
     <message>
         <source>Message:</source>
-        <translation>Mensagem:</translation>
+        <translation type="obsolete">Mensagem:</translation>
     </message>
     <message>
         <source>EMS</source>
         <translation>EMS</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation>Tab</translation>
+        <translation type="obsolete">Tab</translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/oipkg.ts b/i18n/pt/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/pt/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/op-qws.ts b/i18n/pt/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/pt/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/opie-login.ts b/i18n/pt/opie-login.ts
index 729b211..79dee5a 100644
--- a/i18n/pt/opie-login.ts
+++ b/i18n/pt/opie-login.ts
@@ -6,92 +6,96 @@
 accurately to calibrate your screen.</source>
         <translation>Toque na cruz com firmeza e 
 precisão para calibrar o ecrâ.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>Bem vindo ao Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>Entrar</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;Bem-Vindo ao Opie&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilizador</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Palavra Chave</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>Suspender</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>Menu</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>Palavra chave inválida</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>A palavra chave é incorrecta.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">O OPIE terminou 
 devido a um sinal
 de sistema (%1)</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">Não foi possível iniciar o OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>Não foi possível usar essa conta</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Não foi possível usar essa conta.</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/opierec.ts b/i18n/pt/opierec.ts
index 6602e76..126498c 100644
--- a/i18n/pt/opierec.ts
+++ b/i18n/pt/opierec.ts
@@ -151,60 +151,68 @@ the selected file?</source>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Não foi possível abrir o ficheiro àudio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Tocar</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Irradiar</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>Mudar Nome</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>A Irradiar</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Irradiado.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>Gravar</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Localização</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compressão (ficheiros mais pequenos)</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>Silêncio Automático</translation>
+        <translation type="obsolete">Silêncio Automático</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>Silêncio</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/ordesktop.ts b/i18n/pt/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/osearch.ts b/i18n/pt/osearch.ts
index 11b65aa..714848a 100644
--- a/i18n/pt/osearch.ts
+++ b/i18n/pt/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation>Procurar Tudo</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>Sensível a letras grandes/pequenas</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>Usas expressões</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Os detalhes da procura actual</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Introduza os termos a procurar aqui</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicações</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tarefas</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Resultados</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>mostrar</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>editar</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>executar</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>abrir no gestor de ficheiros</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>abrir com</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>mostrar tarefas completas</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>mostrar eventos do passado</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>procurar nas datas</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>Ficheiro:</translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index 088e123..cff1f70 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation>Idioma</translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation>Hora e Data</translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation>Informação Pessoal</translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation>Problema na Aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation>&lt;p&gt;A aplicação %1 não está a responder.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Quer forçar o término da aplicação?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Foi desactivado o carregamento rápido da aplicação. Toque e espere no icon da aplicação para reactivar.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;A aplicação %1 terminou com o código %2.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation>A aplicação terminou</translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation>Não foi encontrada a aplicação</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível localizar a aplicação &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível encontrar a aplicação %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
 </context>
@@ -110,217 +114,245 @@
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Execução</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation>- Execução</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Nenhuma aplicação</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Não há nenhuma aplicação definida para este tipo de documento.&lt;p&gt;O tipo do documento é %1.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ver como texto</translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;A procurar documentos...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation>Vista em Icones</translation>
     </message>
     <message>
         <source>List View</source>
         <translation>Vista em Lista</translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation>Todos os tipos</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation>Vista de Documentos</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Modo Salvaguarda</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>Help...</source>
         <translation>Ajuda...</translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;A data do sistema não parece ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation>O nível de energia está muito baixo.
+        <translation type="obsolete">O nível de energia está muito baixo.
 Desligue o dispositivo ou ligue-o à corrente!</translation>
     </message>
     <message>
         <source>Battery is running very low. </source>
-        <translation>O nível de energia da bateria está muito baixo.</translation>
+        <translation type="obsolete">O nível de energia da bateria está muito baixo.</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation>O nível de energia da bateria extra está baixo.
+        <translation type="obsolete">O nível de energia da bateria extra está baixo.
 Deve carregá-la.</translation>
     </message>
     <message>
         <source>business card</source>
         <translation>Cartão de Visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Modo de Salvaguarda</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;p&gt;Ocorreu um erro ao iniciar. O sistema está agora em modo de salvaguarda e os &quot;plugins&quot; não foram carregados. Poderá usar o gestor de &quot;plugins&quot; para desactivar os que estiverem a causar o erro.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation>Gestor de &quot;Plugins&quot;...</translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation>Estado da Memória</translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation>Memória Baixa
 Grave os seus dados.</translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation>Memória Criticamente em Baixo
 Termine esta aplicação imediatamente.</translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
-        <translation>Desligar</translation>
+        <translation>A desligar...</translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation>Terminar</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation>Terminar o Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation>Reiniciar Dispositivo</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Reiniciar Opie</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation>&lt;p&gt;
 Estas operações estão disponíveis principalmente para desenvolvimento e testes do sistema Opie. Num ambiente normal, estes conceitos são desnecessários.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <source>Shutdown...</source>
-        <translation>A desligar...</translation>
+        <source>Shutdown</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Ligação de Sincronização</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;Se estiver a usar uma versão do Ambiente Qtopia mais antigo que a 1.5.1, deverá actualizá-lo.</translation>
+        <translation type="obsolete">&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;Se estiver a usar uma versão do Ambiente Qtopia mais antigo que a 1.5.1, deverá actualizá-lo.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;É normal se for o primeiro acesso para sincronização.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permitir</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Abort</source>
         <translation>Abortar</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>A Sincronizar:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/quicklauncher.ts b/i18n/pt/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index b352ee1..6ebc763 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Mudar Chave</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar chave</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Introduza chave</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Chave incorrecta</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A chave introduzida está incorrecta.
 Acesso negado</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>Introduza nova chave</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>Reintroduza a chave</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Configurações de Segurança</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar chave</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Limpar chave</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Pedir chave ao ligar</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (omissão)</translation>
+        <translation type="obsolete">192.168.129.0/24 (omissão)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Qualquer</translation>
+        <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>Nenhuma</translation>
+        <translation type="obsolete">Nenhuma</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;p&gt;O uso de chave permite uma protecção mínima contra acessos pontuais ao dispositivo.</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation>Palavra Chave</translation>
     </message>
     <message>
         <source>Login</source>
         <translation>Entrar</translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation>Entrar Automaticamente</translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/sound.ts b/i18n/pt/sound.ts
index 71f317e..89213a5 100644
--- a/i18n/pt/sound.ts
+++ b/i18n/pt/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Frequência:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Directoria de Gravação:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Tecla de Gravação:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Tempo Limite de gravação (segs):</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ilimitada</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>Reiniciar Opie se necessário</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>Key_Record</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index e360a41..a8c4aae 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -50,104 +50,118 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>CPU - Aplicações (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>CPU - Systema (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Tipo:</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>Este gráfico representa a ocupação do processador.</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Total: %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>Esta página mostra quanta memória (i.e. RAM) está alocada no seu dispositivo.
+        <translation type="obsolete">Esta página mostra quanta memória (i.e. RAM) está alocada no seu dispositivo.
 A memória está categorizada da seguinte forma:
 
 1. Usada - memória usada pelo Opie e pelas aplicações a correr.
 2. Buffers - memória temporária usada para melhorar a performance.
 3. Cached - memória temporária para manter a ultima informação usada 
 4. Free - memória não usada.</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Módulo</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Usa#</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>Esta é a lista de todos os módulos do kernel actualmente em utilização neste dispositivo.
 
 Clique e espere num módulo para ver informação adicional, ou para o remover da memória.</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>Seleccione um comando aqui e depois clique no botão &quot;Enviar&quot; para enviar o comando ao módulo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>Clique aqui para enviar o comando seleccionado ao módulo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>Esta àrea mostra a informação detalhada deste módulo.</translation>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation>Deseja mesmo executar %1 para este módulo?</translation>
     </message>
 </context>
@@ -165,118 +179,131 @@ Clique e espere num módulo para ver informação adicional, ou para o remover d
         <source>Available (%1 kB)</source>
         <translation>Disponível (%1 kB)</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>Esta é a lista de todos os processos deste dispositivo.
 
 Clique e espere num processo para ver informação adicional, ou para lhe enviar um sinal.</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>Seleccione um sinal aqui e depois clique no botão &quot;Enviar&quot; para enviar o sinal ao processo seleccionado acima.</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>Clique aqui para enviar o sinal seleccionado ao processo escolhido em cima.</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>Esta àrea mostra a informação detalhada deste processo.</translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>Deseja mesmo enviar %1 para este processo?</translation>
+        <translation type="obsolete">Deseja mesmo enviar %1 para este processo?</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info. Sistema</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processos</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Módulos</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel de Linux&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por:</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Compilado em:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;Versão:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;Modelo:</translation>
+        <translation type="obsolete">&lt;p&gt;Modelo:</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;Marca:</translation>
+        <translation type="obsolete">&lt;p&gt;Marca:</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>Esta página mostra a versão do Opie, do kernel do Linux e da distribuição a correr neste dispositivo.</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt/taboapp.ts b/i18n/pt/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt/tictac.ts b/i18n/pt/tictac.ts
index d1fcdf4..7af795d 100644
--- a/i18n/pt/tictac.ts
+++ b/i18n/pt/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>Jogo do Galo</translation>
+        <translation type="obsolete">Jogo do Galo</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Computador começa</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Humano começa</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Jogar!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Sair</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Click Jogar para começar</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Sua vez de jogar</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Ganhou!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Perdeu!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Empate</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index 8c85b8b..b1b2537 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Hoje</translation>
+        <translation type="obsolete">Hoje</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>De</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Deve preencher o cartão de visita</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>Não foram encontrados extras</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>Não existe nenhum extra activado</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Clique aqui para lançar a aplicação associada</translation>
     </message>
     <message>
         <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Propriedade de %1&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Hoje, por Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>Clique aqui para a janela de configuração</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>Quais os extras a carregar e qual a ordem:</translation>
     </message>
     <message>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index 225fca8..bcdda00 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -177,97 +177,97 @@ Quit Anyway?</source>
 as alterações
 Liberte algum espaço 
 e tente novamente.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tarefa</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>todas as tarefas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>todas as tarefas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>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>&lt;p&gt;Recebidas %1 nova(s) tarefas.&lt;p&gt;Quer adicioná-las a lista?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Novas Tarefas</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Data Limite</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Exemplos</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Editor de Exemplos</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Novo Exemplo %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para mudar a prioridade da tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
@@ -296,96 +296,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para adicionar informação à tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Introduza</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui adicionar uma tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para limpar a informação da tarefa.
 
 Esta àrea é chamada de barra de tarefas rápidas.
 
 Ela permite-lhe adicionar rápidamente uma tarefa à lista. Esta àrea pode ser visível ou não através do menu &quot;Opções -&gt; Mostrar barra de tarefas rápidas&quot;.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Não é possível editar os dados enquanto está a sincronizar</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Não é possível editar os dados enquanto está a sincronizar</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Vista de Tabela</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nada</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
diff --git a/i18n/pt/tonleiter.ts b/i18n/pt/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/pt/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt/zsafe.ts b/i18n/pt/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/pt/zsafe.ts
+++ b/i18n/pt/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 766867e..a351653 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -1303,212 +1303,212 @@ forcnecido livremente !</translation>
         <source>Kyrgyzstan</source>
         <translation>Quirguizstão</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Áreas Palestinas Soberanas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Ilhas Pitcairn</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnã</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pressione para entrar com sobrenome, nome do meio e nome</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Entre o nome completo diretamente ! Se você tem um sobrenome com várias palavras (por exemplo &quot;Da Silva&quot;), escreva &lt;sobrenome&gt;,&lt;nomes&gt; desta forma: &quot;Da Silva, José Maria&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>O Título Profissional</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Algo como &quot;jr.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>O local de trabalho do contato</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pressione para selecionar o atributo a alterar</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pressione para selecionar como o nome será armazenado (e como será mostrado na visão em lista)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Telefone Comercial</translation>
+        <translation type="obsolete">Telefone Comercial</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Fax Comercial</translation>
+        <translation type="obsolete">Fax Comercial</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Celular Comercial</translation>
+        <translation type="obsolete">Celular Comercial</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>E-mail Padrão</translation>
+        <translation type="obsolete">E-mail Padrão</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>E-mails</translation>
+        <translation type="obsolete">E-mails</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Tefone Residencial</translation>
+        <translation type="obsolete">Tefone Residencial</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Fax Residencial</translation>
+        <translation type="obsolete">Fax Residencial</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Celular Pessoal</translation>
+        <translation type="obsolete">Celular Pessoal</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Escritório</translation>
+        <translation type="obsolete">Escritório</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Profissão</translation>
+        <translation type="obsolete">Profissão</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Assistente</translation>
+        <translation type="obsolete">Assistente</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Gerente</translation>
+        <translation type="obsolete">Gerente</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Esposa</translation>
+        <translation type="obsolete">Esposa</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Sexo</translation>
+        <translation type="obsolete">Sexo</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Aniverário</translation>
+        <translation type="obsolete">Aniverário</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Casamento</translation>
+        <translation type="obsolete">Casamento</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Apelido</translation>
+        <translation type="obsolete">Apelido</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Crianças</translation>
+        <translation type="obsolete">Crianças</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Título</translation>
+        <translation type="obsolete">Título</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Nome</translation>
+        <translation type="obsolete">Nome</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Nome do Meio</translation>
+        <translation type="obsolete">Nome do Meio</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Sobrenome</translation>
+        <translation type="obsolete">Sobrenome</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Sufixo</translation>
+        <translation type="obsolete">Sufixo</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Arquivar Como</translation>
+        <translation type="obsolete">Arquivar Como</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Título Profissional</translation>
+        <translation type="obsolete">Título Profissional</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Departamento</translation>
+        <translation type="obsolete">Departamento</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Compania</translation>
+        <translation type="obsolete">Compania</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Endereço Comercial</translation>
+        <translation type="obsolete">Endereço Comercial</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Cidade</translation>
+        <translation type="obsolete">Cidade</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Estado</translation>
+        <translation type="obsolete">Estado</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>CEP</translation>
+        <translation type="obsolete">CEP</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>País</translation>
+        <translation type="obsolete">País</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Pager Comercial</translation>
+        <translation type="obsolete">Pager Comercial</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Página Web Comercial</translation>
+        <translation type="obsolete">Página Web Comercial</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Endereço Residencial</translation>
+        <translation type="obsolete">Endereço Residencial</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Cidade</translation>
+        <translation type="obsolete">Cidade</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Estado</translation>
+        <translation type="obsolete">Estado</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>CEP</translation>
+        <translation type="obsolete">CEP</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>País</translation>
+        <translation type="obsolete">País</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Página Web Pessoal</translation>
+        <translation type="obsolete">Página Web Pessoal</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Notas</translation>
+        <translation type="obsolete">Notas</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index 8a9ac63..532a26c 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -222,96 +222,103 @@ and is licensed by the GPL</source>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>owner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>others</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/appearance.ts b/i18n/pt_BR/appearance.ts
index 8ac51dc..9075cee 100644
--- a/i18n/pt_BR/appearance.ts
+++ b/i18n/pt_BR/appearance.ts
@@ -38,112 +38,96 @@
         <source>Tab style:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Windows</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>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>Unable to delete current scheme.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color schemes are a collection of colors which are used for various parts of the display.
 
diff --git a/i18n/pt_BR/calculator.ts b/i18n/pt_BR/calculator.ts
index 77b6880..7244945 100644
--- a/i18n/pt_BR/calculator.ts
+++ b/i18n/pt_BR/calculator.ts
@@ -82,97 +82,97 @@
         <source>CE</source>
         <translation>CE</translation>
     </message>
     <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>ln</source>
         <translation>ln</translation>
     </message>
     <message>
         <source>+/-</source>
         <translation>+/-</translation>
     </message>
     <message>
         <source>cos</source>
         <translation>cos</translation>
     </message>
     <message>
         <source>log</source>
         <translation>log</translation>
     </message>
     <message>
         <source>sin</source>
         <translation>sen</translation>
     </message>
     <message>
         <source>tan</source>
         <translation>tan</translation>
     </message>
     <message>
         <source>Experimental Calculator</source>
         <translation>Calculadora Experimental</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Calculadora</translation>
+        <translation type="obsolete">Calculadora</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Padrão</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Padrão</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Peso</translation>
     </message>
     <message>
         <source>Distance</source>
         <translation>Distância</translation>
     </message>
     <message>
         <source>Area</source>
         <translation>Área</translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation>Temperatura</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Volume</translation>
     </message>
     <message>
         <source>acres</source>
         <translation>acres</translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation>°C</translation>
     </message>
     <message>
         <source>carats</source>
         <translation>quilates</translation>
     </message>
     <message>
         <source>cm</source>
         <translation>cm</translation>
     </message>
diff --git a/i18n/pt_BR/checkbook.ts b/i18n/pt_BR/checkbook.ts
index b726534..4bf1fcb 100644
--- a/i18n/pt_BR/checkbook.ts
+++ b/i18n/pt_BR/checkbook.ts
@@ -1,505 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</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>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</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>
+    <name>QWidget</name>
     <message>
-        <source>Transaction for </source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Withdrawal</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select date of transaction here.</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number:</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter check number here.</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter description of transaction here.</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select transaction category here.</source>
+        <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>Bills</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>
+        <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
+        <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fee:</source>
+        <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
+        <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information for this transaction here.</source>
+        <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Misc</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Electronics</source>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 8f6b6fc..3e480a3 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -106,96 +106,100 @@ longa que o intervalo entre repetições.</translation>
     <message>
         <source>F</source>
         <translation>S</translation>
     </message>
     <message>
         <source>M</source>
         <translation>S</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>T</source>
         <translation>Q</translation>
     </message>
     <message>
         <source>W</source>
         <translation>Q</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sábado</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Quarta</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Quinta</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>End</source>
         <translation>Fim</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Enviar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Início</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>Este evento ocupa todo o dia.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Horário</translation>
     </message>
     <message>
         <source> - </source>
         <translation> - </translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -321,96 +325,104 @@ longa que o intervalo entre repetições.</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Início-Fim</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Padrões</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Escitório</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Residência</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Este evento ocupa todo o dia.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>s</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>S: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>No Repeat...</source>
         <translation>Sem Repetição...</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetir...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>Diariamente...</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>Calendário</translation>
     </message>
     <message>
         <source>Yearly...</source>
         <translation>Anualmente...</translation>
     </message>
     <message>
         <source>Monthly...</source>
@@ -472,97 +484,101 @@ longa que o intervalo entre repetições.</translation>
         <translation>Repetir</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>Local</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Silencioso</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Viagem</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>O Dia Todo</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>Categoria</translation>
     </message>
     <message>
         <source>New Event</source>
         <translation>Novo Evento</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Zona Horária</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Descrição</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Início - Fim</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Nota...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation>Horário Inicial</translation>
+        <translation type="obsolete">Horário Inicial</translation>
+    </message>
+    <message>
+        <source>Start time</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Editar Nota</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Almoço</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Every</source>
         <translation>Todo(a)</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 todo(a) </translation>
     </message>
     <message>
         <source>Every </source>
         <translation>Todo(a) </translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Sexta</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Saturday</source>
diff --git a/i18n/pt_BR/doctab.ts b/i18n/pt_BR/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/pt_BR/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/filebrowser.ts b/i18n/pt_BR/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/pt_BR/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/gsmtool.ts b/i18n/pt_BR/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/pt_BR/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/kate.ts b/i18n/pt_BR/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/pt_BR/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/launchersettings.ts b/i18n/pt_BR/launchersettings.ts
index 8cdb19d..1214e2e 100644
--- a/i18n/pt_BR/launchersettings.ts
+++ b/i18n/pt_BR/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
@@ -105,104 +159,104 @@
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libclockapplet.ts b/i18n/pt_BR/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/pt_BR/libclockapplet.ts
+++ b/i18n/pt_BR/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/pt_BR/libfreetypefactory.ts b/i18n/pt_BR/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libkeyview.ts b/i18n/pt_BR/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/pt_BR/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libmemoryapplet.ts b/i18n/pt_BR/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/pt_BR/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libmpeg3plugin.ts b/i18n/pt_BR/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/liboapp.ts b/i18n/pt_BR/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libopie.ts b/i18n/pt_BR/libopie.ts
index f7c8985..b7bb05d 100644
--- a/i18n/pt_BR/libopie.ts
+++ b/i18n/pt_BR/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>Botão Correio</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>Botão Início</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>Botão Gravar</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>Rotação da Tela</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>Inferior+Cima</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>Inferior+Baixo</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>Inferior+Direita</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>Inferior+Esquerda</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>Superior+Cima</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>Superior+Baixo</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Superior+Direita</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Superior+Esquerda</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>Mat:</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>Sat:</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>Val:</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>Verm:</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>Verde:</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>Azul:</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>Canal Alfa:</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>Selecione a cor</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>Mais</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>Mais...</translation>
+        <translation type="obsolete">Mais...</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>DiálogoArquivo</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salvar</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamanho</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>Tipo Mime</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>Grande</translation>
@@ -365,96 +377,100 @@ e</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation>semana(s)</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>Repete por</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dia</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>A cada</translation>
     </message>
     <message>
         <source>on </source>
         <translation>na(o)</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Hora:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Escolha a Hora:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Prazo:</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>E-mail Padrão:</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>Escritório:</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Página Web Comercial:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefone Comercial:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Fax Comercial:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Celular Comercial:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Pager Comercial:</translation>
     </message>
     <message>
@@ -582,79 +598,263 @@ e</translation>
         <translation>Domingo</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Documentos</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Arquivos</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Todos os arquivos</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Muito Alto</translation>
     </message>
     <message>
         <source>High</source>
         <translation>Alto</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>Normal</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Localização:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Este evento dura todo o dia</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Este evento dura vários dias</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Profissional:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Profissional:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Residencial:&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Endereço Residencial:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>No(a) %1 de cada </translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>º</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>º</translation>
     </message>
     <message>
         <source>th</source>
         <translation>º</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libopiecore2.ts b/i18n/pt_BR/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/pt_BR/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libopiedb2.ts b/i18n/pt_BR/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libopiemm2.ts b/i18n/pt_BR/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libopiepim2.ts b/i18n/pt_BR/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libopieui2.ts b/i18n/pt_BR/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libqdasher.ts b/i18n/pt_BR/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/pt_BR/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 86c3f03..f567629 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -820,109 +820,109 @@ tente novamente.</translation>
         <translation>Jan</translation>
     </message>
     <message>
         <source>Feb</source>
         <translation>Fev</translation>
     </message>
     <message>
         <source>Mar</source>
         <translation>Mar</translation>
     </message>
     <message>
         <source>Apr</source>
         <translation>Abr</translation>
     </message>
     <message>
         <source>May</source>
         <translation>Mai</translation>
     </message>
     <message>
         <source>Jun</source>
         <translation>Jun</translation>
     </message>
     <message>
         <source>Jul</source>
         <translation>Jul</translation>
     </message>
     <message>
         <source>Aug</source>
         <translation>Ago</translation>
     </message>
     <message>
         <source>Sep</source>
         <translation>Sep</translation>
     </message>
     <message>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation>Erro</translation>
+        <translation type="obsolete">Erro</translation>
     </message>
     <message>
         <source>Could not find the application </source>
-        <translation>Impossível localizar a aplicação</translation>
+        <translation type="obsolete">Impossível localizar a aplicação</translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation>OK</translation>
+        <translation type="obsolete">OK</translation>
     </message>
     <message>
         <source>Could not start the application </source>
-        <translation>Impossível iniciar a aplicação</translation>
+        <translation type="obsolete">Impossível iniciar a aplicação</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 documento</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>Disco Rígido SCSI</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>Armazenamento Interno</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>Cartão SD</translation>
     </message>
     <message>
         <source>CF Card</source>
         <translation>Cartão CF</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>Disco Rígido</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>Memória Interna</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>Cartão MMC</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt_BR/librestartapplet.ts b/i18n/pt_BR/librestartapplet.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/librestartapplet.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/libtinykate.ts b/i18n/pt_BR/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/pt_BR/libtinykate.ts
+++ b/i18n/pt_BR/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/pt_BR/libtodayaddressbookplugin.ts b/i18n/pt_BR/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/pt_BR/libtodayaddressbookplugin.ts
+++ b/i18n/pt_BR/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/libtodaydatebookplugin.ts b/i18n/pt_BR/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/pt_BR/libtodaydatebookplugin.ts
+++ b/i18n/pt_BR/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/libtodaytodolistplugin.ts b/i18n/pt_BR/libtodaytodolistplugin.ts
index b423a53..711d14e 100644
--- a/i18n/pt_BR/libtodaytodolistplugin.ts
+++ b/i18n/pt_BR/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/pt_BR/libvtapplet.ts b/i18n/pt_BR/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/pt_BR/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/light-and-power.ts b/i18n/pt_BR/light-and-power.ts
index eb978ea..75a7e85 100644
--- a/i18n/pt_BR/light-and-power.ts
+++ b/i18n/pt_BR/light-and-power.ts
@@ -1,58 +1,65 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Off</source>
         <translation type="unfinished">Desligada</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation type="unfinished">Apagar luz após</translation>
     </message>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation type="unfinished">Detectando a luz ambiente do local onde você está usando o dispositivo a iluminação pode ser ajustada automaticamente. A configuração de brilho ainda afeta a média de blilho.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation type="unfinished">Diminuir a luz após</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation type="unfinished">Suspender após</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
@@ -68,85 +75,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on AC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/mobilemsg.ts b/i18n/pt_BR/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/pt_BR/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/oipkg.ts b/i18n/pt_BR/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/pt_BR/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/op-qws.ts b/i18n/pt_BR/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/pt_BR/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/opie-login.ts b/i18n/pt_BR/opie-login.ts
index f4806d5..0ce0332 100644
--- a/i18n/pt_BR/opie-login.ts
+++ b/i18n/pt_BR/opie-login.ts
@@ -4,80 +4,80 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/opierec.ts b/i18n/pt_BR/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/pt_BR/opierec.ts
+++ b/i18n/pt_BR/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/ordesktop.ts b/i18n/pt_BR/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/osearch.ts b/i18n/pt_BR/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/pt_BR/osearch.ts
+++ b/i18n/pt_BR/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index 775b84d..5551969 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -1,64 +1,68 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -111,223 +115,233 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Contatos&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Cancelar</translation>
     </message>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sincronizando</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/quicklauncher.ts b/i18n/pt_BR/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index 5255944..fc5b0da 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -1,119 +1,244 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Security</name>
     <message>
         <source>Any</source>
         <translation>Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Mudar senha</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Senha incorreta</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Entre a senha</translation>
     </message>
     <message>
         <source>Set passcode</source>
         <translation>Ajustar senha</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>A senha inserida está incorreta.
 Acesso negado</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Any</source>
-        <translation type="unfinished">Qualquer</translation>
+        <translation type="obsolete">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
-        <translation type="unfinished">Nenhum</translation>
+        <translation type="obsolete">Nenhum</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation type="unfinished">Mudar a senha</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
     </message>
     <message>
         <source>Security Settings</source>
         <translation type="unfinished">Ajustes</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation type="unfinished">Limpar a senha</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation type="unfinished">Requisitar senha ao ligar</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation type="unfinished">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
     </message>
     <message>
-        <source>192.168.0.0/16</source>
+        <source>192.168.129.0/24 (default)</source>
+        <translation type="obsolete">192.168.129.0/24 (padrão)</translation>
+    </message>
+    <message>
+        <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>172.16.0.0/12</source>
+        <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>10.0.0.0/8</source>
+        <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="unfinished">192.168.129.0/24 (padrão)</translation>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.1.0/24</source>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1.0.0.0/8</source>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passcode</source>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login</source>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Login Automatically</source>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/showimg.ts b/i18n/pt_BR/showimg.ts
index e28a330..d0fe2fe 100644
--- a/i18n/pt_BR/showimg.ts
+++ b/i18n/pt_BR/showimg.ts
@@ -104,86 +104,83 @@
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/sound.ts b/i18n/pt_BR/sound.ts
index 1b47297..fc49eb4 100644
--- a/i18n/pt_BR/sound.ts
+++ b/i18n/pt_BR/sound.ts
@@ -80,50 +80,54 @@
     <message>
         <source>30</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>20</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>15</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/sysinfo.ts b/i18n/pt_BR/sysinfo.ts
index 0889c56..e77ad68 100644
--- a/i18n/pt_BR/sysinfo.ts
+++ b/i18n/pt_BR/sysinfo.ts
@@ -44,105 +44,109 @@
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Type: </source>
         <translation>Tipo: </translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uso de CPU pelo sistema (%)</translation>
     </message>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uso de CPU por aplicações (%)</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Memória Total: %1 kB</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Buffers (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Em cache (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Livre (%1 kB)</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use#</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
@@ -155,119 +159,120 @@ Click and hold on a module to see additional information about the module, or to
         <translation>Usado (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Tempo</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Estado</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Comando</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Envia</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>CPU</source>
         <translation>CPU</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memória</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Processo</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Armazenamento</translation>
     </message>
     <message>
         <source>System Info</source>
         <translation>Informações do Sistema</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>Compiled by: </source>
         <translation>Compilado por: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt; Versão: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Gerado em: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Kernel do Linux&lt;/b&gt;&lt;p&gt; Versão: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Vendor: </source>
+        <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/taboapp.ts b/i18n/pt_BR/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/pt_BR/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/pt_BR/tictac.ts b/i18n/pt_BR/tictac.ts
index faaf1d7..bab95fe 100644
--- a/i18n/pt_BR/tictac.ts
+++ b/i18n/pt_BR/tictac.ts
@@ -1,49 +1,42 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index d113f4f..fd69302 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -1,55 +1,55 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Hoje</translation>
+        <translation type="obsolete">Hoje</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index c3ff910..0d3583a 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -178,97 +178,97 @@ Quit Anyway?</source>
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tarefas</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">Impossível editar dados durante sincronização</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>todas as tarefas?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>todas as tarefas completadas?</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Não preenchido</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;%1 novas tarefas chegaram.&lt;p&gt;Gostaria de adicioná-las as sua Lista de Tarefas ?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Tarefas Novas</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Duplicar</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="obsolete">Descrição</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Prazo</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>Configurar Modelos</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Editor de Modelo</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>Novo Modelo %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para mudar a prioridade de uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
@@ -296,96 +296,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para inserir informações adicionais para uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrar</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para adicionar uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>Clique aqui para limpar as informações de uma nova tarefa.
 
 Esta área é chamada de barra de tarefas rápida.
 
 Ela permite que você adicione rapidamente uma nova tarefa a sua lista.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar barra de tarefas rápida&apos; no menu acima.</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>Dados não podem ser editados. Sincronização em andamento</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>Dados não podem ser editados. Sincronização em andamento</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Visão em tabela</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 dia(s)</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Editar</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>hora</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>Descrição:</translation>
diff --git a/i18n/pt_BR/tonleiter.ts b/i18n/pt_BR/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/pt_BR/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/pt_BR/zsafe.ts b/i18n/pt_BR/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/pt_BR/zsafe.ts
+++ b/i18n/pt_BR/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index e473833..65d1973 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -1303,212 +1303,212 @@ je zastonj!</translation>
         <source>Kyrgyzstan</source>
         <translation>Kyrgyzstan</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>Palestinian Sovereign Areas</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>Pitcairn Islands</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>Vietnam</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>Pritisnite, da vpišete priimek- in ime</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>Vpišite celo ime direktno! Če imate več priimkov (primer: &quot;Božič Novak&quot; ), prosimo vpišite &lt;priimek&gt;,&lt;ime&gt; kot to: &quot;Božič Novak, Jože&quot;</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>Naziv delovnega mesta..</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>Nekaj kot &quot;ml.&quot;..</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>Delovno mesto stika</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>Pritisnite, da izberete parameter, ki bi ga radi spremenili</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>Pristisnite, da izberete kako shraniti ime (in kako ga prikazati v seznamu)</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>Službeni telefon</translation>
+        <translation type="obsolete">Službeni telefon</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>Službeni faks</translation>
+        <translation type="obsolete">Službeni faks</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>Službeni mobitel</translation>
+        <translation type="obsolete">Službeni mobitel</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>Privzeta epošta</translation>
+        <translation type="obsolete">Privzeta epošta</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>Epošta</translation>
+        <translation type="obsolete">Epošta</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>Domači telefon</translation>
+        <translation type="obsolete">Domači telefon</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>Domači faks</translation>
+        <translation type="obsolete">Domači faks</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>Domači mobitel</translation>
+        <translation type="obsolete">Domači mobitel</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>Pisarna</translation>
+        <translation type="obsolete">Pisarna</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>Poklic</translation>
+        <translation type="obsolete">Poklic</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>Pomočnik</translation>
+        <translation type="obsolete">Pomočnik</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>Upravnik</translation>
+        <translation type="obsolete">Upravnik</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>Zakonec</translation>
+        <translation type="obsolete">Zakonec</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>Spol</translation>
+        <translation type="obsolete">Spol</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>Rojstni dan</translation>
+        <translation type="obsolete">Rojstni dan</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>Obletnica</translation>
+        <translation type="obsolete">Obletnica</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>Vzdevek</translation>
+        <translation type="obsolete">Vzdevek</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>Otroci</translation>
+        <translation type="obsolete">Otroci</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>Naziv</translation>
+        <translation type="obsolete">Naziv</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>Ime</translation>
+        <translation type="obsolete">Ime</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>Medimek</translation>
+        <translation type="obsolete">Medimek</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>Priimek</translation>
+        <translation type="obsolete">Priimek</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Pripona</translation>
+        <translation type="obsolete">Pripona</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>Datoteka kot</translation>
+        <translation type="obsolete">Datoteka kot</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>Delovno mesto</translation>
+        <translation type="obsolete">Delovno mesto</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>Oddelek</translation>
+        <translation type="obsolete">Oddelek</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>Podjetje</translation>
+        <translation type="obsolete">Podjetje</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>Ulica podjetja</translation>
+        <translation type="obsolete">Ulica podjetja</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>Mesto podjetja</translation>
+        <translation type="obsolete">Mesto podjetja</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>Okrožje podjetja</translation>
+        <translation type="obsolete">Okrožje podjetja</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>Poštna št. podjetja</translation>
+        <translation type="obsolete">Poštna št. podjetja</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>Država podjetja</translation>
+        <translation type="obsolete">Država podjetja</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>Službeni pozivnik</translation>
+        <translation type="obsolete">Službeni pozivnik</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>Službena spletna stran</translation>
+        <translation type="obsolete">Službena spletna stran</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>Domača ulica</translation>
+        <translation type="obsolete">Domača ulica</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>Domače mesto</translation>
+        <translation type="obsolete">Domače mesto</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>Domače okrožje</translation>
+        <translation type="obsolete">Domače okrožje</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>Domača poštna številka</translation>
+        <translation type="obsolete">Domača poštna številka</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>Domača država</translation>
+        <translation type="obsolete">Domača država</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>Domača spletna stran</translation>
+        <translation type="obsolete">Domača spletna stran</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>Zapiski</translation>
+        <translation type="obsolete">Zapiski</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index d3fde90..4b39163 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -247,96 +247,103 @@ Ni med zaznamki!!</translation>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Odstrani trenutni imenik iz zaznamkov</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>Shrani izhod v datoteko (samo ime)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>Nastavi datotečne pravice</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>Nastavi datotečne pravice za:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>lastnik</translation>
     </message>
     <message>
         <source>group</source>
         <translation>skupina</translation>
     </message>
     <message>
         <source>others</source>
         <translation>drugi</translation>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index b0b08e3..af90d25 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -38,109 +38,109 @@
         <translation>Stil zavihka:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zavihki</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Zavihki - ikone</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>Roletni seznam</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>Roletni seznam - ikone</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Zgoraj</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Spodaj</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>Stil</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>Okna</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napredno</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 %1 now?</source>
-        <translation>Ali bi radi ponovno zagnali %1?</translation>
+        <translation type="obsolete">Ali bi radi ponovno zagnali %1?</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>Save Scheme</source>
         <translation>Shrani shemo</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Shrani shemo</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Shema že obstaja.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Izbriši shemo</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Ne morem izbrisati trenutne sheme.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;nova&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>Stil nadzoruje kako se gumbi in roletni seznami prikažejo v vseh programih.
 
 Kliknite tu, da izberete med stili, ki so na voljo.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>Kliknite tu, da nastavite trenutno uporabljen stil.
 
 Opozorilo: Ta opcija ni na voljo v vseh stilih.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>Dekoracija oken nadzoruje kako se naslovna letev ter gumbi prikazujejo v programih.
 
 Kliknite tu, da izberete dekoracije, ki so na voljo.</translation>
diff --git a/i18n/sl/calculator.ts b/i18n/sl/calculator.ts
index 3d4061b..f0dedcf 100644
--- a/i18n/sl/calculator.ts
+++ b/i18n/sl/calculator.ts
@@ -81,97 +81,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>Kalkulator</translation>
+        <translation type="obsolete">Kalkulator</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>Običajen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">Običajen</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index 02afc1e..e2c52c5 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -1,524 +1,750 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>Nova čekovna knjižica</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>Transakcije</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>Grafi</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>Ime:</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>Vpišite ime čekovne knjižice.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Izberite tip čekovne knjižice.</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>Prihranki</translation>
+        <translation type="obsolete">Prihranki</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>Preverjam</translation>
+        <translation type="obsolete">Preverjam</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>CD</translation>
+        <translation type="obsolete">CD</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>Denarni trg</translation>
+        <translation type="obsolete">Denarni trg</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>Skupni fond</translation>
+        <translation type="obsolete">Skupni fond</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>Drugo</translation>
+        <translation type="obsolete">Drugo</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>Banka:</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Vpišite ime banke za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Številka računa:</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>Vpišite številko računa za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>Številka PIN:</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>Vpišite številko PIN za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>Začetno stanje:</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Vpišite začetno stanje za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Vpišite dodatne informacije za to čekovno knjižico.</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>Trenutno stanje: %10.00</translation>
+        <translation type="obsolete">Trenutno stanje: %10.00</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>Ta prostor prikazuje trenutno stanje v čekovni knjižici.</translation>
+        <translation type="obsolete">Ta prostor prikazuje trenutno stanje v čekovni knjižici.</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>To je seznam vseh vnesenih transakcij za to čekovno knjižico.
 
 Da uredite vnose po določenem polju, kliknite na ime stolpca.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>Vsota</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>Kliknite tu, da dodate novo transakcijo.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>Izberite transakcijo, nato pa kliknite tu, da jo uredite.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>Izberite željen graf spodaj in nato kliknite na gumb Riši.</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>Kliknite tu, da izberete željeni tip grafa.</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>Stanje računa</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>Dvigi po kategoriji</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>Pologi po kategoriji</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Riši</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Kliknite tu, da narišem izbran graf.</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>Trenutno stanje: %1%2</translation>
+        <translation type="obsolete">Trenutno stanje: %1%2</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>Izbriši transakcijo</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Zaščita z geslom</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknite tu, da vključite/izključite zaščito z geslom na čekovni knjižici.</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>Številka</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite vaše geslo:</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>Potrdite geslo</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>Prosim potrdite vaše geslo:</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>Prosim vnesite vaše geslo, da potrdite odstranitev zaščite z geslom:</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">Stanje</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>Spremeni nastavitve čekovne knjižice</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>Vpšite simbol za valuto:</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>Vpišite vaš lokalen simbol za valuto.</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>Prikaži, če je čekovna knjižica zaščitena
 z geslom</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>Kliknite tu, da izberete, če želite, da glavno okno prikaže ali je čekovna knjižica zaščitena z geslom.</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>Prikaži stanja čekovne knjižice</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>Kliknite tu, da izberete, če želite, da glavno okno prikaže trenutno stanje za vsako čekovno knjižico.</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Izbriši</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>Čekovna knjižica</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>Kliknite tu, da ustvarite novo čekovno knjižico.
 
 Lahko pa tudi izberete Nova iz menuja.</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</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>Izberite čekovno knjižico in nato kliknite tu da jo uredite.
 
 Lahko tudi izberete Uredi iz menija ali pa kliknete in zadržite na imenu čekovne knjižice.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>Izberite čekovno knjižico in nato kliknite tu da jo izbrišete.
 
 Lahko tudi izberete Izbriši iz menuja.</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>To je seznam vseh čekovnih knjižic, ki so trenutno na voljo.</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>Izbriši čekovno knjižico</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Spremeni nastavitve</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>Kliknite tu, da spremenite nastavitve za ta program.</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>Ime čekovne knjižice</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>Stanje</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>Vnesite geslo</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>Prosim vnesite geslo:</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">Datum</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">Uredi</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">Nova</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">Izbriši</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">Prihranki</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">Preverjam</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">CD</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">Denarni trg</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">Skupni fond</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">Drugo</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">Avto</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">Računi</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">CDji</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">Oblačila</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">Računalnik</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">DVDji</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">Zabava</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">Hrana</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">Bencin</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">Različno</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">Filmi</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">Najem</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">Potovanje</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">Delo</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">Član družine</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">Različni krediti</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>Transakcija za</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>Dvig</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>Izberite ali je transakcija dvig ali polog.</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>Polog</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>Datum:</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>Izberite datum za transakcijo.</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Številka:</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>Vpišite številko čeka.</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>Vpišite opis transakcije.</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>Izberite kategorijo transakcije.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Tip:</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>Izberite tip transakcije.
 
 Možnosti, ki so na voljo so odvisne od tega ali je transakcija polog ali pa dvig.</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>Vsota:</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto transakcije.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>Pristojbina:</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>Vnesite vsoto pristojbine povezane s to transakcijo.
 
 Vnesena vrednost mora biti pozitivna.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Zapiski:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Vnesite dodatne informacije za transakcijo.</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>Avto</translation>
+        <translation type="obsolete">Avto</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>Računi</translation>
+        <translation type="obsolete">Računi</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>CDji</translation>
+        <translation type="obsolete">CDji</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>Oblačila</translation>
+        <translation type="obsolete">Oblačila</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>Računalnik</translation>
+        <translation type="obsolete">Računalnik</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>DVDji</translation>
+        <translation type="obsolete">DVDji</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">Elektronika</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>Zabava</translation>
+        <translation type="obsolete">Zabava</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>Hrana</translation>
+        <translation type="obsolete">Hrana</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>Bencin</translation>
+        <translation type="obsolete">Bencin</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>Različno</translation>
+        <translation type="obsolete">Različno</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>Filmi</translation>
+        <translation type="obsolete">Filmi</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>Najem</translation>
+        <translation type="obsolete">Najem</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>Potovanje</translation>
+        <translation type="obsolete">Potovanje</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>Dolg</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Ček</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Prenos</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditna kartica</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>Delo</translation>
+        <translation type="obsolete">Delo</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>Član družine</translation>
+        <translation type="obsolete">Član družine</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>Različni krediti</translation>
+        <translation type="obsolete">Različni krediti</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotovina</translation>
     </message>
-    <message>
-        <source>Electronics</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 3cdf201..a205282 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -106,96 +106,100 @@ Izhod?</translation>
     <message>
         <source>M</source>
         <translation>P</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>S</translation>
     </message>
     <message>
         <source>F</source>
         <translation>P</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Ponedeljek</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Torek</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>Sreda</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>Četrtek</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>Petek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Nedelja</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Prežarči</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source> - </source>
         <translation>-</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>Podvoji</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -321,96 +325,104 @@ Izhod?</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation>Začetek-Konec</translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>Lokacija:</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To je celodnevni dogodek.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. Jan-00. Jan</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>t</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>T: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>M</source>
         <comment>Monday</comment>
         <translation type="obsolete">P</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">T</translation>
     </message>
     <message>
         <source>W</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">S</translation>
     </message>
     <message>
         <source>T</source>
         <comment>Thursday</comment>
         <translation type="obsolete">Č</translation>
     </message>
     <message>
         <source>F</source>
         <comment>Friday</comment>
         <translation type="obsolete">P</translation>
     </message>
     <message>
         <source>S</source>
         <comment>Saturday</comment>
         <translation type="obsolete">S</translation>
@@ -491,117 +503,117 @@ Izhod?</translation>
         <translation>Večerja</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>Potovanje</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>Jan 02 00</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Cel dan</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;Alarm</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>minut</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>Tiho</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>Glasno</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>Ponovi</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>Ne ponovi...</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">Začetni čas</translation>
+        <translation type="unfinished">Začetni čas</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>Časovni pas</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Začetek - Konec</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Opombe...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">Začetni čas</translation>
+        <translation type="obsolete">Začetni čas</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>Uredi opombo</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>&lt;b&gt;1/10&lt;/b&gt; Kosilo</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>Začetek</translation>
     </message>
     <message>
         <source>End</source>
         <translation>Konec</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>Vsak %1 %2</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Vsak %1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>%1 %1 od vsakega</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/sl/doctab.ts b/i18n/sl/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/sl/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/filebrowser.ts b/i18n/sl/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/sl/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/gsmtool.ts b/i18n/sl/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/sl/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/kate.ts b/i18n/sl/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/sl/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/launchersettings.ts b/i18n/sl/launchersettings.ts
index 0c29240..67a959c 100644
--- a/i18n/sl/launchersettings.ts
+++ b/i18n/sl/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>Nastavitve zaganjalnika</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>Preklopna vrstica</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>O-menu</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zavihki</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>Naloži programčke v O-menu:</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>Prikaži zaganjalnikove zavihke v O-menuju</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Obkljukajte programčke, ki jih želite imeti v O-menuju.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Doda vsebino zaganjalnikovih zavihkov v menu in v O-menu.</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished">Primer 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished">Primer 1</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished">Primer 1</translation>
     </message>
 </context>
 <context>
     <name>SampleView</name>
     <message>
         <source>Sample 1</source>
         <translation type="obsolete">Primer 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="obsolete">Primer 1</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="obsolete">Primer 1</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>Uredi zavihek</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>Ozadje</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>Pisava</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>Ikone</translation>
@@ -121,103 +175,111 @@
         <source>Default</source>
         <translation>Privzeto</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>Velikost:</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>Majhna</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>Velika</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>Barva:</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>Zaganjalnikovi zavihki:</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>foobar</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Uredi</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Vklopi velik kazalnik zasedenosti</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>Vklopi utripajoč kazalnik zasedenosti</translation>
+        <translation type="obsolete">Vklopi utripajoč kazalnik zasedenosti</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Izberi zaganjalnikov zavihek, ki ga želite urediti ali izbrisati.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Doda nov zavihek v zaganjalnik.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Odpre novo okno za prireditev izbranega zavihka.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Izbriše zavihek iz zaganjalnika.</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>Vklopite to, če želite, da je velik kazalnik zasedenosti v sredini zaslona namesto v opravilni vrstici.</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>Vklopite to, če želite, da je utripajoč kazalnik zasedenosti za zaganjanje programov v zaganjalniku.</translation>
+        <translation type="obsolete">Vklopite to, če želite, da je utripajoč kazalnik zasedenosti za zaganjanje programov v zaganjalniku.</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>Vsi zavihki</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenti</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>Še ni implementirano</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>Naloži programčke v opravilno vrstico:</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>Obkljukajte programčke, ki jih želite v opravilni vrstici.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libclockapplet.ts b/i18n/sl/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/sl/libclockapplet.ts
+++ b/i18n/sl/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/sl/libfreetypefactory.ts b/i18n/sl/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libmemoryapplet.ts b/i18n/sl/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/sl/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libmpeg3plugin.ts b/i18n/sl/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/liboapp.ts b/i18n/sl/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libopie.ts b/i18n/sl/libopie.ts
index 296b8f4..bf0d38d 100644
--- a/i18n/sl/libopie.ts
+++ b/i18n/sl/libopie.ts
@@ -16,142 +16,150 @@
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
@@ -364,184 +372,180 @@ and </source>
     </message>
     <message>
         <source>Sun</source>
         <translation type="unfinished">Ned</translation>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dan</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Vsak</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Izberi čas:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Home Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Emails: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profession: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Assistant: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Manager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Male</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Female</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gender: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Spouse: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -591,69 +595,253 @@ and </source>
     <message>
         <source>Every</source>
         <translation type="unfinished">Vsak</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Monday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Friday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopiecore2.ts b/i18n/sl/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/sl/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libopiedb2.ts b/i18n/sl/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libopiemm2.ts b/i18n/sl/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libopiepim2.ts b/i18n/sl/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libopieui2.ts b/i18n/sl/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/libqdasher.ts b/i18n/sl/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/sl/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 1030c88..2dc2495 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -818,109 +818,97 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">Napaka</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Napaka</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
 </context>
 <context>
     <name>QPEDecoration</name>
     <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="obsolete">&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="obsolete">Kaj je to...</translation>
     </message>
 </context>
 <context>
     <name>QPEManager</name>
     <message>
         <source>Click to close this window, discarding changes.</source>
         <translation type="obsolete">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="obsolete">Kliknite tu, da zaprete to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="obsolete">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
     </message>
     <message>
         <source>Click to make this window moveable.</source>
         <translation type="obsolete">Kliknite tu, da naredite to okno premično.</translation>
     </message>
     <message>
         <source>Click to make this window use all available screen area.</source>
         <translation type="obsolete">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF kartica</translation>
diff --git a/i18n/sl/libtinykate.ts b/i18n/sl/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/sl/libtinykate.ts
+++ b/i18n/sl/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/sl/libtodayaddressbookplugin.ts b/i18n/sl/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/sl/libtodayaddressbookplugin.ts
+++ b/i18n/sl/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libtodaydatebookplugin.ts b/i18n/sl/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/sl/libtodaydatebookplugin.ts
+++ b/i18n/sl/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/sl/libtodaytodolistplugin.ts b/i18n/sl/libtodaytodolistplugin.ts
index b423a53..711d14e 100644
--- a/i18n/sl/libtodaytodolistplugin.ts
+++ b/i18n/sl/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/sl/libvtapplet.ts b/i18n/sl/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/sl/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/light-and-power.ts b/i18n/sl/light-and-power.ts
index f89c2d0..0f659be 100644
--- a/i18n/sl/light-and-power.ts
+++ b/i18n/sl/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>S tipanjem svetlobe kjer uporabljate napravo, lahko nastavite avtomatično nastavljanje osvetlitve. Svetlobne nastavitve vplivajo na povprečno osvetlitev.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>Zatemni po</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>Izključi po</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>Ugasni po</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>Ugasnjeno</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>never</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation type="unfinished"></translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>on AC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> %</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Off</source>
         <translation type="unfinished">Ugasnjeno</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Light</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Steps</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/mobilemsg.ts b/i18n/sl/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/sl/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/oipkg.ts b/i18n/sl/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/sl/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/op-qws.ts b/i18n/sl/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/sl/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/opie-login.ts b/i18n/sl/opie-login.ts
index f4806d5..0ce0332 100644
--- a/i18n/sl/opie-login.ts
+++ b/i18n/sl/opie-login.ts
@@ -4,80 +4,80 @@
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/opierec.ts b/i18n/sl/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/sl/opierec.ts
+++ b/i18n/sl/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/ordesktop.ts b/i18n/sl/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/osearch.ts b/i18n/sl/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/sl/osearch.ts
+++ b/i18n/sl/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index 0086e26..c9e4524 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -110,223 +114,233 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">Sinhroniziram</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;Kontakti&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;Prekliči</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/quicklauncher.ts b/i18n/sl/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index 986bb8d..86db9bd 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>Nastavi kodo</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>Vpišite kodo</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>Koda ni pravilna</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>Vpisana koda ni pravilna.
 Dostop zavrnjen</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>Varnostne nastavitve</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>Zamenjaj kodo</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>Zbriši kodo</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>Potrebna koda pri vklopu</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinhroniziraj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Sperjmi sinhronizacijo iz mreže:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>Karkoli</translation>
+        <translation type="obsolete">Karkoli</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>brez</translation>
+        <translation type="obsolete">brez</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (privzeto)</translation>
+        <translation type="obsolete">192.168.129.0/24 (privzeto)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/showimg.ts b/i18n/sl/showimg.ts
index e3587d1..cdaea04 100644
--- a/i18n/sl/showimg.ts
+++ b/i18n/sl/showimg.ts
@@ -103,86 +103,83 @@
         <source>%1 colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/sound.ts b/i18n/sl/sound.ts
index f2c7013..ac1c9ab 100644
--- a/i18n/sl/sound.ts
+++ b/i18n/sl/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>Vzorčna stopnja:</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>Snemalni imenik:</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>Snemalna tipka:</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>Omejitev snemanja v sekundah:</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Neomejeno</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/sl/sysinfo.ts b/i18n/sl/sysinfo.ts
index 8e3397f..4a73edc 100644
--- a/i18n/sl/sysinfo.ts
+++ b/i18n/sl/sysinfo.ts
@@ -43,105 +43,109 @@
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>Uporaba CPE v aplikacijah (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>Uporaba CPE v sistemu (%)</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>Type: </translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Uporabljeno (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>Medpomnilniki (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>Predpomneno (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>Prosto (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>Skupen spomin: %1 kB</translation>
     </message>
     <message>
-        <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>Modul</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Uporabi#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">Uporablja ga</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Used by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You really want to execute %1 for this module?</source>
         <translation type="unfinished"></translation>
@@ -158,119 +162,120 @@ Click and hold on a module to see additional information about the module, or to
         <translation>Na voljo (%1 kB)</translation>
     </message>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>Ukaz</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Status</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send</source>
         <translation type="unfinished">Pošlji</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Informacija o sistemu</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Spomin</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Pomnilnik</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>CPE</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>Proces</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Različica</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>Moduli</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux jedro&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>Prevedel: </translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Različica: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>Zgrajeno na: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Model: </source>
+        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Vendor: </source>
+        <source>&lt;br&gt;Model: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
+        <source>&lt;br&gt;Vendor: </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/taboapp.ts b/i18n/sl/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/sl/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/sl/tictac.ts b/i18n/sl/tictac.ts
index d809cc5..096d036 100644
--- a/i18n/sl/tictac.ts
+++ b/i18n/sl/tictac.ts
@@ -1,48 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>Začne računalnik</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>Začne človek</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>Igraj!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Izhod</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>Pritisni Igraj za začetek</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>Vi ste na potezi</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Zmagali ste!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>Zmagal je računalnik!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>Neodločeno</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/today.ts b/i18n/sl/today.ts
index b8a4f9f..95ebc14 100644
--- a/i18n/sl/today.ts
+++ b/i18n/sl/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>Danes</translation>
+        <translation type="obsolete">Danes</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">Lastnik je</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosim izplonite poslovno kartico</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Danes</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index f60ce01..3d03490 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -171,97 +171,97 @@ Quit Anyway?</source>
 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="obsolete">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>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished">Podvoji</translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished">K.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished">Opis</translation>
+        <translation type="obsolete">Opis</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
@@ -269,96 +269,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/sl/tonleiter.ts b/i18n/sl/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/sl/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/sl/zsafe.ts b/i18n/sl/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/sl/zsafe.ts
+++ b/i18n/sl/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index 3a4c014..8ff596c 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -1292,212 +1292,212 @@ is provided free !</source>
         <source>Kyrgyzstan</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to enter last- middle and firstname</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter fullname directly ! If you have a lastname with multiple words ( for instance &quot;de la Guerra&quot;), please write &lt;lastname&gt;,&lt;firstnames&gt; like this: &quot;de la Guerra, Carlos Pedro&quot;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The jobtitle..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Something like &quot;jr.&quot;..</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The working place of the contact</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select attribute to change</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press to select how to store the name (and howto show it in the listview)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index f6d596f..6607d71 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -234,96 +234,103 @@ and is licensed by the GPL</source>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cannot remove current directory
 from bookmarks.
 It is not bookmarked!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Copy &apos;%1&apos; As</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save output to file (name only)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>others</source>
         <translation>FOO</translation>
diff --git a/i18n/xx/appearance.ts b/i18n/xx/appearance.ts
index 32c92fb..f882a22 100644
--- a/i18n/xx/appearance.ts
+++ b/i18n/xx/appearance.ts
@@ -38,109 +38,109 @@
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Yes</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>No</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Save Scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired name, style and size of the default font applications will use.</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/calculator.ts b/i18n/xx/calculator.ts
index 32ea1ae..a0fd242 100644
--- a/i18n/xx/calculator.ts
+++ b/i18n/xx/calculator.ts
@@ -85,97 +85,97 @@
         <source>4</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>/</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>7</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>9</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calculator</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cu cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/xx/checkbook.ts b/i18n/xx/checkbook.ts
index 532f102..365228d 100644
--- a/i18n/xx/checkbook.ts
+++ b/i18n/xx/checkbook.ts
@@ -2,508 +2,734 @@
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Savings</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Checking</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>CD</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Money market</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Mutual fund</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</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>FOO</translation>
     </message>
     <message>
         <source>Num</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation>FOO</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>FOO</translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</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>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Balance</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>QWidget</name>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Savings</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Checking</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>CD</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Money market</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Mutual fund</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automobile</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Bills</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>CDs</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Clothing</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Computer</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>DVDs</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entertainment</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Food</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Gasoline</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Misc</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Movies</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Rent</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Travel</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Work</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Family Member</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>Misc. Credit</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+</context>
+<context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Automobile</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Bills</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>CDs</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Clothing</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Computer</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>DVDs</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Eletronics</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Entertainment</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Food</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Gasoline</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Misc</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Movies</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Rent</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Travel</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Work</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Family Member</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Misc. Credit</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Electronics</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index f93ea2a..15cf9f5 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -100,96 +100,100 @@ Quit anyway?</source>
     <message>
         <source>M</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>T</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>W</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>F</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>S</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -319,97 +323,97 @@ Quit anyway?</source>
     </message>
     <message>
         <source>Defaults</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstDayHdr</name>
     <message>
         <source>MTWTFSSM</source>
         <comment>Week days</comment>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mo</source>
         <comment>Monday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Tu</source>
         <comment>Tuesday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>We</source>
         <comment>Wednesday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Th</source>
         <comment>Thursday</comment>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Fr</source>
@@ -473,137 +477,137 @@ Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/xx/doctab.ts b/i18n/xx/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/xx/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/filebrowser.ts b/i18n/xx/filebrowser.ts
new file mode 100644
index 0000000..a7e2016
--- a/dev/null
+++ b/i18n/xx/filebrowser.ts
@@ -0,0 +1,247 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>FileBrowser</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Name </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Size </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Date </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Type </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ascending</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hidden</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Symlinks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thumbnails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Previous dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parent dir</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FileView</name>
+    <message>
+        <source>File Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t show /dev/ directory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure?</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>Delete failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder creation failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch Application</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Launch failed!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to Documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Run</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View as text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rename</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Paste</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deselect all</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Change permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>filePermissions</name>
+    <message>
+        <source>Set File Permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set file permissions for:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>others</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Owner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>write</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>execute</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/gsmtool.ts b/i18n/xx/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/xx/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/kate.ts b/i18n/xx/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/xx/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/launchersettings.ts b/i18n/xx/launchersettings.ts
index 146d1d4..34c5fe9 100644
--- a/i18n/xx/launchersettings.ts
+++ b/i18n/xx/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Background</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type:</source>
@@ -106,103 +160,111 @@
         <source>Default</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Small</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>foobar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enable blinking busy indicator</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libfreetypefactory.ts b/i18n/xx/libfreetypefactory.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libfreetypefactory.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libkeyview.ts b/i18n/xx/libkeyview.ts
new file mode 100644
index 0000000..4f2b2a8
--- a/dev/null
+++ b/i18n/xx/libkeyview.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Keyview</name>
+    <message>
+        <source>Keyview</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libmemoryapplet.ts b/i18n/xx/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/xx/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libmpeg3plugin.ts b/i18n/xx/libmpeg3plugin.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libmpeg3plugin.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/liboapp.ts b/i18n/xx/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libopie.ts b/i18n/xx/libopie.ts
index d1146b3..77cf1ba 100644
--- a/i18n/xx/libopie.ts
+++ b/i18n/xx/libopie.ts
@@ -16,141 +16,153 @@
     <message>
         <source>Mail Button</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Val:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Red:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Green:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select color</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>More...</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation>FOO</translation>
@@ -363,102 +375,106 @@ and </source>
     </message>
     <message>
         <source>week(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>on </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Office: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>FOO</translation>
@@ -596,79 +612,259 @@ and </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>High</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Normal</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Very low</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The %1 %2 of every</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>nd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>rd</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>th</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopiecore2.ts b/i18n/xx/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/xx/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libopiedb2.ts b/i18n/xx/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libopiemm2.ts b/i18n/xx/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libopiepim2.ts b/i18n/xx/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libopieui2.ts b/i18n/xx/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/libqdasher.ts b/i18n/xx/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/xx/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index ceb3ad5..650834e 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -808,109 +808,97 @@ Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">FOO</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/xx/libtinykate.ts b/i18n/xx/libtinykate.ts
index 7287a22..3130fe3 100644
--- a/i18n/xx/libtinykate.ts
+++ b/i18n/xx/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>FOO</translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/xx/libtodayaddressbookplugin.ts b/i18n/xx/libtodayaddressbookplugin.ts
index 9867230..916f1a5 100644
--- a/i18n/xx/libtodayaddressbookplugin.ts
+++ b/i18n/xx/libtodayaddressbookplugin.ts
@@ -1,93 +1,113 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clip line after X chars: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">FOO</translation>
+        <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> days: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libvtapplet.ts b/i18n/xx/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/xx/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/light-and-power.ts b/i18n/xx/light-and-power.ts
index c468215..9fc39bd 100644
--- a/i18n/xx/light-and-power.ts
+++ b/i18n/xx/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>Light and Power Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>never</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>set a fix value for backlight</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>FOO</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> %</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> sec</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/mobilemsg.ts b/i18n/xx/mobilemsg.ts
new file mode 100644
index 0000000..a9ca041
--- a/dev/null
+++ b/i18n/xx/mobilemsg.ts
@@ -0,0 +1,49 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>MobileMsgBase</name>
+    <message>
+        <source>Mobile Messaging</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Flash</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Messages: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unicode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nokia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Image:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>EMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/oipkg.ts b/i18n/xx/oipkg.ts
new file mode 100644
index 0000000..1f93af3
--- a/dev/null
+++ b/i18n/xx/oipkg.ts
@@ -0,0 +1,355 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InstallDialog</name>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ipkg options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-depends</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-reinstall</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-removal-of-essential-packages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>-force-overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To install</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Package Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>feeds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ipkgfind&amp;killefiz</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>documents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Section:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Section</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Filter</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Actions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Package Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, not installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Old version, new version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New version, old version installed</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageListView</name>
+    <message>
+        <source>Package</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettings</name>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PackageManagerSettingsBase</name>
+    <message>
+        <source>Package Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install destination:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link to root destination</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used servers: (Highlighted feeds are active)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Destinations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>link to /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove links</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>volatile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>removeable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PmIpkg</name>
+    <message>
+        <source>
+All done.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Removing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>please wait</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while removing </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error while installing</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Description: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> on </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Link: </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>Destination: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Install to</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>RunWindow</name>
+    <message>
+        <source>running...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/op-qws.ts b/i18n/xx/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/xx/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/opie-login.ts b/i18n/xx/opie-login.ts
index e88e202..a7dfdba 100644
--- a/i18n/xx/opie-login.ts
+++ b/i18n/xx/opie-login.ts
@@ -5,90 +5,94 @@
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>User</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/opierec.ts b/i18n/xx/opierec.ts
index ee27845..75d0e17 100644
--- a/i18n/xx/opierec.ts
+++ b/i18n/xx/opierec.ts
@@ -149,60 +149,68 @@ the selected file?</source>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rename</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Rec</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>auto Mute</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Stop</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/ordesktop.ts b/i18n/xx/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/osearch.ts b/i18n/xx/osearch.ts
index 8c11bb7..2c1af85 100644
--- a/i18n/xx/osearch.ts
+++ b/i18n/xx/osearch.ts
@@ -32,96 +32,100 @@
     <message>
         <source>Search all</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>show past events</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 912f512..a462097 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -190,96 +194,100 @@ Please charge the back-up battery.</source>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Finding documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Searching documents</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Video</source>
@@ -305,178 +313,198 @@ Please charge the back-up battery.</source>
         <source>Your decision will be stored on the medium.</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">FOO</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/quicklauncher.ts b/i18n/xx/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index ecddb87..8673d95 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -1,117 +1,262 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">FOO {192.168.129.0/24?}</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">FOO</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/showimg.ts b/i18n/xx/showimg.ts
index f81d86d..c188955 100644
--- a/i18n/xx/showimg.ts
+++ b/i18n/xx/showimg.ts
@@ -103,86 +103,83 @@
         <source> - Image Viewer</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 colors</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> True color</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>s</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/sound.ts b/i18n/xx/sound.ts
index 69f6e82..53fa37c 100644
--- a/i18n/xx/sound.ts
+++ b/i18n/xx/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>Key_Calender</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Key_Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Key_Menu</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Key_Mail</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>30</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>20</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>15</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>10</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>5</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/sysinfo.ts b/i18n/xx/sysinfo.ts
index 20b9deb..3badb53 100644
--- a/i18n/xx/sysinfo.ts
+++ b/i18n/xx/sysinfo.ts
@@ -30,118 +30,132 @@
         <translation>FOO</translation>
     </message>
     <message>
         <source>In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>RA</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Used (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Used by</source>
@@ -169,118 +183,131 @@ Click and hold on a module to see additional information about the module, or to
 </context>
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>You really want to send %1 to this process?</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
+    </message>
+    <message>
+        <source>Really want to send %1
+to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/xx/taboapp.ts b/i18n/xx/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/xx/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/xx/tictac.ts b/i18n/xx/tictac.ts
index d21f9a7..c81a74e 100644
--- a/i18n/xx/tictac.ts
+++ b/i18n/xx/tictac.ts
@@ -1,48 +1,48 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>TicTac</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/today.ts b/i18n/xx/today.ts
index 5bb0955..ac06e4e 100644
--- a/i18n/xx/today.ts
+++ b/i18n/xx/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Owned by %1&lt;/b&gt;</source>
         <translation type="obsolete">FOO</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index 0daa264..9315713 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -170,97 +170,97 @@ to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</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>FOO</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>C.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>FOO</translation>
+        <translation type="obsolete">FOO</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure Templates</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
@@ -268,96 +268,100 @@ This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>More</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation>FOO</translation>
diff --git a/i18n/xx/tonleiter.ts b/i18n/xx/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/xx/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/xx/zsafe.ts b/i18n/xx/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/xx/zsafe.ts
+++ b/i18n/xx/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 448606f..507554e 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -1295,212 +1295,212 @@ is provided free !</source>
         <source>Bolivia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cameroon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ghana</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guadeloupe</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Guinea-Bissau</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jamaica</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kiribati</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Kyrgyzstan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Palestinian Sovereign Areas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Pitcairn Islands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Vietnam</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Business Phone</source>
-        <translation>公司電話號碼</translation>
+        <translation type="obsolete">公司電話號碼</translation>
     </message>
     <message>
         <source>Business Fax</source>
-        <translation>公司傳真號碼</translation>
+        <translation type="obsolete">公司傳真號碼</translation>
     </message>
     <message>
         <source>Business Mobile</source>
-        <translation>公司手機號碼</translation>
+        <translation type="obsolete">公司手機號碼</translation>
     </message>
     <message>
         <source>Default Email</source>
-        <translation>預設電郵地址</translation>
+        <translation type="obsolete">預設電郵地址</translation>
     </message>
     <message>
         <source>Emails</source>
-        <translation>電子郵件</translation>
+        <translation type="obsolete">電子郵件</translation>
     </message>
     <message>
         <source>Home Phone</source>
-        <translation>住家電話號碼</translation>
+        <translation type="obsolete">住家電話號碼</translation>
     </message>
     <message>
         <source>Home Fax</source>
-        <translation>住家傳真號碼</translation>
+        <translation type="obsolete">住家傳真號碼</translation>
     </message>
     <message>
         <source>Home Mobile</source>
-        <translation>私人手機號碼</translation>
+        <translation type="obsolete">私人手機號碼</translation>
     </message>
     <message>
         <source>Office</source>
-        <translation>公司</translation>
+        <translation type="obsolete">公司</translation>
     </message>
     <message>
         <source>Profession</source>
-        <translation>職業</translation>
+        <translation type="obsolete">職業</translation>
     </message>
     <message>
         <source>Assistant</source>
-        <translation>助理</translation>
+        <translation type="obsolete">助理</translation>
     </message>
     <message>
         <source>Manager</source>
-        <translation>經理</translation>
+        <translation type="obsolete">經理</translation>
     </message>
     <message>
         <source>Spouse</source>
-        <translation>配偶</translation>
+        <translation type="obsolete">配偶</translation>
     </message>
     <message>
         <source>Gender</source>
-        <translation>性別</translation>
+        <translation type="obsolete">性別</translation>
     </message>
     <message>
         <source>Birthday</source>
-        <translation>生日</translation>
+        <translation type="obsolete">生日</translation>
     </message>
     <message>
         <source>Anniversary</source>
-        <translation>週年紀念日</translation>
+        <translation type="obsolete">週年紀念日</translation>
     </message>
     <message>
         <source>Nickname</source>
-        <translation>綽號</translation>
+        <translation type="obsolete">綽號</translation>
     </message>
     <message>
         <source>Children</source>
-        <translation>子女</translation>
+        <translation type="obsolete">子女</translation>
     </message>
     <message>
         <source>Name Title</source>
-        <translation>名稱</translation>
+        <translation type="obsolete">名稱</translation>
     </message>
     <message>
         <source>First Name</source>
-        <translation>名</translation>
+        <translation type="obsolete">名</translation>
     </message>
     <message>
         <source>Middle Name</source>
-        <translation>中名</translation>
+        <translation type="obsolete">中名</translation>
     </message>
     <message>
         <source>Last Name</source>
-        <translation>姓</translation>
+        <translation type="obsolete">姓</translation>
     </message>
     <message>
         <source>Suffix</source>
-        <translation>Suffix</translation>
+        <translation type="obsolete">Suffix</translation>
     </message>
     <message>
         <source>File As</source>
-        <translation>歸檔為</translation>
+        <translation type="obsolete">歸檔為</translation>
     </message>
     <message>
         <source>Job Title</source>
-        <translation>職稱</translation>
+        <translation type="obsolete">職稱</translation>
     </message>
     <message>
         <source>Department</source>
-        <translation>部門</translation>
+        <translation type="obsolete">部門</translation>
     </message>
     <message>
         <source>Company</source>
-        <translation>公司</translation>
+        <translation type="obsolete">公司</translation>
     </message>
     <message>
         <source>Business Street</source>
-        <translation>公司所在街道名稱</translation>
+        <translation type="obsolete">公司所在街道名稱</translation>
     </message>
     <message>
         <source>Business City</source>
-        <translation>公司所在城市名稱</translation>
+        <translation type="obsolete">公司所在城市名稱</translation>
     </message>
     <message>
         <source>Business State</source>
-        <translation>公司所在州名</translation>
+        <translation type="obsolete">公司所在州名</translation>
     </message>
     <message>
         <source>Business Zip</source>
-        <translation>公司郵遞區號</translation>
+        <translation type="obsolete">公司郵遞區號</translation>
     </message>
     <message>
         <source>Business Country</source>
-        <translation>公司所在國家名稱</translation>
+        <translation type="obsolete">公司所在國家名稱</translation>
     </message>
     <message>
         <source>Business Pager</source>
-        <translation>公司呼叫器號碼</translation>
+        <translation type="obsolete">公司呼叫器號碼</translation>
     </message>
     <message>
         <source>Business WebPage</source>
-        <translation>公司網頁</translation>
+        <translation type="obsolete">公司網頁</translation>
     </message>
     <message>
         <source>Home Street</source>
-        <translation>住家所在街道名稱</translation>
+        <translation type="obsolete">住家所在街道名稱</translation>
     </message>
     <message>
         <source>Home City</source>
-        <translation>住家所在城市名稱</translation>
+        <translation type="obsolete">住家所在城市名稱</translation>
     </message>
     <message>
         <source>Home State</source>
-        <translation>住家所在州名</translation>
+        <translation type="obsolete">住家所在州名</translation>
     </message>
     <message>
         <source>Home Zip</source>
-        <translation>住家郵遞區號</translation>
+        <translation type="obsolete">住家郵遞區號</translation>
     </message>
     <message>
         <source>Home Country</source>
-        <translation>住家所在國家名稱</translation>
+        <translation type="obsolete">住家所在國家名稱</translation>
     </message>
     <message>
         <source>Home Web Page</source>
-        <translation>個人網頁</translation>
+        <translation type="obsolete">個人網頁</translation>
     </message>
     <message>
         <source>Notes</source>
-        <translation>備註</translation>
+        <translation type="obsolete">備註</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index e2f8c34..5a39733 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -236,96 +236,103 @@ It is not bookmarked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 exists. Ok to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not copy %1 to %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete %1
 and all it&apos;s contents ?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Really delete
 %1?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB free</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Could not copy 
+%1 
+to 
+%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Output</name>
     <message>
         <source>Save output to file (name only)</source>
         <translation>將輸出存為檔案(只有名稱)</translation>
     </message>
     <message>
         <source>Output</source>
         <translation>輸出</translation>
     </message>
     <message>
         <source>Process could not start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 Finished
 </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>filePermissions</name>
     <message>
         <source>Set File Permissions</source>
         <translation>設定檔案權限</translation>
     </message>
     <message>
         <source>Set file permissions for:</source>
         <translation>設定這個檔案的權限:</translation>
     </message>
     <message>
         <source>owner</source>
         <translation>所有者</translation>
     </message>
     <message>
         <source>group</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>others</source>
         <translation>其他</translation>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index 74770fa..fddbbf3 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -38,109 +38,109 @@
         <translation>標籤頁樣式:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>索引標籤</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>有圖示的索引標籤</translation>
     </message>
     <message>
         <source>Drop down list</source>
         <translation>直式索引標籤</translation>
     </message>
     <message>
         <source>Drop down list w/icons</source>
         <translation>有圖示的直式索引標籤</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>頂端</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>底部</translation>
     </message>
     <message>
         <source>Style</source>
         <translation>樣式</translation>
     </message>
     <message>
         <source>Font</source>
         <translation>字型</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Windows</source>
         <translation>視窗</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation>重新啟動</translation>
+        <translation type="obsolete">重新啟動</translation>
     </message>
     <message>
         <source>Do you want to restart %1 now?</source>
-        <translation>您現在想要重新啟動 %1 ?</translation>
+        <translation type="obsolete">您現在想要重新啟動 %1 ?</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>Save Scheme</source>
         <translation>儲存主題</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>儲存主題</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>主題已經存在.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>刪除主題</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>無法刪除目前的主題.</translation>
     </message>
     <message>
         <source>&lt;new&gt;</source>
         <translation>&lt;新增&gt;</translation>
     </message>
     <message>
         <source>Styles control the way items such as buttons and scroll bars appear in all applications.
 
 Click here to select an available style.</source>
         <translation>樣式控制了按鈕, 捲動軸等項目在所有應用程式中的顯示方式.
 
 請按這裡以選擇可以使用的樣式.</translation>
     </message>
     <message>
         <source>Click here to configure the currently selected style.
 
 Note:  This option is not available for all styles.</source>
         <translation>請按這裡以設定目前選擇的樣式.
 
 注意: 並非所有的樣式都有這個選項.</translation>
     </message>
     <message>
         <source>Window decorations control the way the application title bar and its buttons appear.
 
 Click here to select an available decoration.</source>
         <translation>視窗裝飾控制了應用程式的標題列與其按鈕的顯示方式.
 
 請按這裡以選擇可以使用的裝飾.</translation>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 9a36777..5903018 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -81,97 +81,97 @@
         <source>x</source>
         <translation>x</translation>
     </message>
     <message>
         <source>4</source>
         <translation>4</translation>
     </message>
     <message>
         <source>8</source>
         <translation>8</translation>
     </message>
     <message>
         <source>/</source>
         <translation>/</translation>
     </message>
     <message>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>.</source>
         <translation>.</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>7</source>
         <translation>7</translation>
     </message>
     <message>
         <source>9</source>
         <translation>9</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Calculator</source>
-        <translation>計算機</translation>
+        <translation type="obsolete">計算機</translation>
     </message>
     <message>
         <source>Standard</source>
         <translation>標準</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation type="unfinished">標準</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Temperatures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Volume</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>acres</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&#xb0;C</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>carats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>cm</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/zh_TW/calibrate.ts b/i18n/zh_TW/calibrate.ts
new file mode 100644
index 0000000..6af2a57
--- a/dev/null
+++ b/i18n/zh_TW/calibrate.ts
@@ -0,0 +1,14 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Calibrate</name>
+    <message>
+        <source>Touch the crosshairs firmly and
+accurately to calibrate your screen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Welcome to Opie</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/checkbook.ts b/i18n/zh_TW/checkbook.ts
index b726534..4bf1fcb 100644
--- a/i18n/zh_TW/checkbook.ts
+++ b/i18n/zh_TW/checkbook.ts
@@ -1,505 +1,631 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>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>
+    <message>
+        <source>Sort by:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select checkbook sorting here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry Order</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SortDate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Balance</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>
+    <message>
+        <source>&amp;Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Account Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Account Types</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Category</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expense</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Income</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Payees</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open last checkbook</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last open checkbook will be opened at startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show last checkbook tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select whether the last tab in a checkbook should be displayed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save new description as payee</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to save new descriptions in the list of payess.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ListEdit</name>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</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>
+    <name>QWidget</name>
     <message>
-        <source>Transaction for </source>
+        <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Withdrawal</source>
+        <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select whether the transaction is a withdrawal or deposit here.</source>
+        <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Deposit</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
+        <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select date of transaction here.</source>
+        <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Number:</source>
+        <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter check number here.</source>
+        <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Description:</source>
+        <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter description of transaction here.</source>
+        <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Category:</source>
+        <source>Expense</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select transaction category here.</source>
+        <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
+        <source>Bills</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>
+        <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Amount:</source>
+        <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter the amount of transaction here.
-
-The value entered should always be positive.</source>
+        <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Fee:</source>
+        <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any fee amount assoiciated with this transaction.
-
-The value entered should always be positive.</source>
+        <source>Electronics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter any additional information for this transaction here.</source>
+        <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automobile</source>
+        <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Bills</source>
+        <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CDs</source>
+        <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clothing</source>
+        <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Computer</source>
+        <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>DVDs</source>
+        <source>Income</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Entertainment</source>
+        <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Food</source>
+        <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Gasoline</source>
+        <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Transaction</name>
     <message>
-        <source>Misc</source>
+        <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Movies</source>
+        <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rent</source>
+        <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Travel</source>
+        <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debit Charge</source>
+        <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Written Check</source>
+        <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transfer</source>
+        <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Credit Card</source>
+        <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Work</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Family Member</source>
+        <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Misc. Credit</source>
+        <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatic Payment</source>
+        <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cash</source>
+        <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Electronics</source>
+        <source>Select transaction type here.
+
+The options available vary based on whether the transaction is a deposit or withdrawal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Amount:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter the amount of transaction here.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fee:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any fee amount assoiciated with this transaction.
+
+The value entered should always be positive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enter any additional information for this transaction here.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Debit Charge</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Written Check</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transfer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Credit Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatic Payment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index e8946f4..e630c7c 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -103,96 +103,100 @@ Quit anyway?</translation>
     <message>
         <source>M</source>
         <translation>M</translation>
     </message>
     <message>
         <source>T</source>
         <translation>T</translation>
     </message>
     <message>
         <source>W</source>
         <translation>W</translation>
     </message>
     <message>
         <source>F</source>
         <translation>F</translation>
     </message>
     <message>
         <source>S</source>
         <translation>S</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>一</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>二</translation>
     </message>
     <message>
         <source>Wednesday</source>
         <translation>三</translation>
     </message>
     <message>
         <source>Thursday</source>
         <translation>四</translation>
     </message>
     <message>
         <source>Friday</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>天</translation>
     </message>
+    <message>
+        <source>DateBookDayHeaderBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookDayView</name>
     <message>
         <source>:00p</source>
         <translation>:00p</translation>
     </message>
 </context>
 <context>
     <name>DateBookDayWidget</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>紅外線</translation>
     </message>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Duplicate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam this occurence</source>
@@ -318,96 +322,104 @@ Quit anyway?</translation>
     </message>
     <message>
         <source>Start-End</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office</source>
         <translation type="unfinished">公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation type="unfinished">家</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>這是一個終日事件.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeaderBase</name>
     <message>
         <source>00. Jan-00. Jan</source>
         <translation>00. 一月-00. 一月</translation>
     </message>
 </context>
 <context>
+    <name>DateBookWeekLstDayHdr</name>
+    <message>
+        <source>MTWTFSSM</source>
+        <comment>Week days</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>DateBookWeekLstHeader</name>
     <message>
         <source>w</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekLstHeaderBase</name>
     <message>
         <source>W: 00,00</source>
         <translation>W: 00,00</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekView</name>
     <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>行事曆</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>重覆...</translation>
     </message>
     <message>
         <source>Daily...</source>
         <translation>每日...</translation>
     </message>
     <message>
         <source>Weekly...</source>
         <translation>每星期...</translation>
     </message>
     <message>
         <source>Monthly...</source>
         <translation>每月...</translation>
     </message>
     <message>
         <source>Yearly...</source>
@@ -425,145 +437,145 @@ Quit anyway?</translation>
         <source>End Time</source>
         <translation>結束時間</translation>
     </message>
 </context>
 <context>
     <name>DateEntryBase</name>
     <message>
         <source>New Event</source>
         <translation>新事件</translation>
     </message>
     <message>
         <source>Location</source>
         <translation>地點</translation>
     </message>
     <message>
         <source>Category</source>
         <translation>分類</translation>
     </message>
     <message>
         <source>Meeting</source>
         <translation>約會</translation>
     </message>
     <message>
         <source>Lunch</source>
         <translation>中餐</translation>
     </message>
     <message>
         <source>Dinner</source>
         <translation>晚餐</translation>
     </message>
     <message>
         <source>Travel</source>
         <translation>旅行</translation>
     </message>
     <message>
         <source>Office</source>
         <translation>公司</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>家</translation>
     </message>
     <message>
         <source>Jan 02 00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start time</source>
-        <translation type="obsolete">開始時間</translation>
+        <translation type="unfinished">開始時間</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>終日</translation>
     </message>
     <message>
         <source>Time zone</source>
         <translation>時區</translation>
     </message>
     <message>
         <source>&amp;Alarm</source>
         <translation>&amp;A鬧鐘</translation>
     </message>
     <message>
         <source> minutes</source>
         <translation>分鐘</translation>
     </message>
     <message>
         <source>Silent</source>
         <translation>沉默</translation>
     </message>
     <message>
         <source>Loud</source>
         <translation>大聲</translation>
     </message>
     <message>
         <source>Repeat</source>
         <translation>重覆</translation>
     </message>
     <message>
         <source>No Repeat...</source>
         <translation>不重覆...</translation>
     </message>
     <message>
         <source>Description </source>
         <translation>序述</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>開始 - 結束</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>備忘錄...</translation>
     </message>
     <message>
         <source>Start Time</source>
-        <translation type="unfinished">開始時間</translation>
+        <translation type="obsolete">開始時間</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NoteEntryBase</name>
     <message>
         <source>Edit Note</source>
         <translation>編輯備忘錄</translation>
     </message>
     <message>
         <source>&lt;b&gt;1/10&lt;/b&gt; Lunch</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>End</source>
         <translation>結束</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>每</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>每 %1 %2 </translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>每%1</translation>
     </message>
     <message>
         <source>The %1 %1 of every</source>
         <translation>每%1 %1</translation>
     </message>
     <message>
         <source>Every </source>
diff --git a/i18n/zh_TW/doctab.ts b/i18n/zh_TW/doctab.ts
new file mode 100644
index 0000000..2793e30
--- a/dev/null
+++ b/i18n/zh_TW/doctab.ts
@@ -0,0 +1,28 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>DocTabSettingsBase</name>
+    <message>
+        <source>DocTab Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Do you want a Documents Tab?&lt;/b&gt;&lt;p&gt;
+(Note that such a tab scans &lt;i&gt;all&lt;/i&gt; documents
+on &lt;i&gt;all&lt;/i&gt; external media, which can be quite
+slow and annyoing...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable the DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes, please!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No, thanks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/gsmtool.ts b/i18n/zh_TW/gsmtool.ts
new file mode 100644
index 0000000..edc5d66
--- a/dev/null
+++ b/i18n/zh_TW/gsmtool.ts
@@ -0,0 +1,209 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>GSMToolBase</name>
+    <message>
+        <source>GSM Tool</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Modem Device:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ircomm0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttySA0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>/dev/ttyS0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Baud Rate:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>300</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>1200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>4800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>9600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>19200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>38400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>57600</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>115200</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>230400</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>460800</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Connect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manufacturer:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Model:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Revision:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Serial Number:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Status:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Current Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Signal Strength:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>dBm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Available Networks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scan</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Shortname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Register</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SMS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Store:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incoming</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Outgoing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Date</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Send</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>To:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Message:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/kate.ts b/i18n/zh_TW/kate.ts
new file mode 100644
index 0000000..f1498d1
--- a/dev/null
+++ b/i18n/zh_TW/kate.ts
@@ -0,0 +1,61 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>TinyKate</name>
+    <message>
+        <source>TinyKATE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font +</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font -</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>View</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Utils</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unnamed %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/launchersettings.ts b/i18n/zh_TW/launchersettings.ts
index 8cdb19d..1214e2e 100644
--- a/i18n/zh_TW/launchersettings.ts
+++ b/i18n/zh_TW/launchersettings.ts
@@ -1,86 +1,140 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>DocTabSettings</name>
+    <message>
+        <source>Enable the Documents Tab</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the Documents Tab to be visible.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>InputMethodSettings</name>
+    <message>
+        <source>Resize application on Popup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable floating and resizing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Note:&lt;/b&gt; Changing these settings may need restarting Opie to become effective.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want the application to be automatically resized if the input method pops up.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check, if you want to move and/or resize input methods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Specify the percentage of the screen width for the input method</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LauncherSettings</name>
     <message>
         <source>Launcher Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>InputMethods</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MenuSettings</name>
     <message>
         <source>Load applets in O-Menu:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Launcher tabs in O-Menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show Applications in subpopups</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sample 3</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabDialog</name>
     <message>
         <source>Edit Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Previewing %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a rough preview of what the currently selected Tab will look like.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use a custom font</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
@@ -105,104 +159,104 @@
     <message>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Small</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Color:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabsSettings</name>
     <message>
         <source>Launcher Tabs:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>foobar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not implemented yet</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable animated busy indicator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Activate this, if you want an animatedbusy indicator for starting applications in the Launcher.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TaskbarSettings</name>
     <message>
         <source>Load applets in Taskbar:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check the applets that you want displayed in the Taskbar.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libclockapplet.ts b/i18n/zh_TW/libclockapplet.ts
index db92457..4eb9e18 100644
--- a/i18n/zh_TW/libclockapplet.ts
+++ b/i18n/zh_TW/libclockapplet.ts
@@ -1,5 +1,2 @@
 <!DOCTYPE TS><TS>
-<context>
-    <name>LauncherClock</name>
-</context>
 </TS>
diff --git a/i18n/zh_TW/libmemoryapplet.ts b/i18n/zh_TW/libmemoryapplet.ts
new file mode 100644
index 0000000..d272a66
--- a/dev/null
+++ b/i18n/zh_TW/libmemoryapplet.ts
@@ -0,0 +1,156 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>LoadInfo</name>
+    <message>
+        <source>Application CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>System CPU usage (%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This page shows how much this device&apos;s processor is being used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type: </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryInfo</name>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Memory: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Used (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffers (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cached (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Free (%1 kB)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MemoryStatus</name>
+    <message>
+        <source>Memory Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;center&gt;&lt;b&gt;Memory Monitor Plugin&lt;/b&gt;&lt;br&gt;Copyright (C) 2003 Anton Maslovsky&lt;br&gt;&amp;lt;&lt;a href=&quot;mailto:my-zaurus@narod.ru&quot;&gt;my-zaurus@narod.ru&lt;/a&gt;&amp;gt;&lt;br&gt;&lt;a href=&quot;http://my-zaurus.narod.ru&quot;&gt;http://my-zaurus.narod.ru&lt;/a&gt;&lt;br&gt;Based on source code from:&lt;br&gt; qswap (udoseidel@gmx.de) &lt;br&gt; Battery Applet (trolltech.com) &lt;br&gt; SysInfo (OPIE)&lt;br&gt;&lt;br&gt;This program is licensed under GNU GPL.&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Swapfile</name>
+    <message>
+        <source>Swapfile location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>RAM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CF Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>SD Card</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> On </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> Off </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manage Swapfile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to detach swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile deactivated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile created.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to remove swapfile.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Swapfile activated.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/liboapp.ts b/i18n/zh_TW/liboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/liboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libopie.ts b/i18n/zh_TW/libopie.ts
index 493d2ea..03aa9b9 100644
--- a/i18n/zh_TW/libopie.ts
+++ b/i18n/zh_TW/libopie.ts
@@ -16,142 +16,150 @@
     <message>
         <source>Mail Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Home Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Record Button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display Rotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Lower+Left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Action Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>OK Button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End Button</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OColorDialog</name>
     <message>
         <source>Hue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Val:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Red:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blue:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha channel:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select color</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OColorPopupMenu</name>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>More...</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>OFileDialog</name>
     <message>
         <source>FileDialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileSelector</name>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFileViewFileListView</name>
     <message>
         <source>Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mime Type</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OFontMenu</name>
     <message>
         <source>Large</source>
         <translation type="unfinished"></translation>
     </message>
@@ -363,96 +371,100 @@ and </source>
     </message>
     <message>
         <source>week(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Repeat By</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">日</translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>month(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">每</translation>
     </message>
     <message>
         <source>on </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>Time:</source>
         <translation>Time:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
     </message>
     <message>
         <source>Pick Time:</source>
         <translation>Pick Time:</translation>
     </message>
+    <message>
+        <source>OTimePickerDialogBase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Default Email: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Office: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -579,80 +591,256 @@ and </source>
         <source>Sunday</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very high</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>High</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Very low</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <source>The %1 %2 of every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The %1 %2 of every</source>
+        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>User Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Categories</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>First Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Middle Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Last Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Suffix</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File As</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Job Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Department</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Company</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Email</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Emails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Phone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Fax</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Mobile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business Pager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Business WebPage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Office</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Profession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Assistant</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Street</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home City</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home State</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Zip</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Country</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Home Web Page</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Spouse</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Gender</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Birthday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Anniversary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Nickname</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Children</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
         <source>st</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>nd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>rd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>th</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libopiecore2.ts b/i18n/zh_TW/libopiecore2.ts
new file mode 100644
index 0000000..849bace
--- a/dev/null
+++ b/i18n/zh_TW/libopiecore2.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Trash</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libopiedb2.ts b/i18n/zh_TW/libopiedb2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/libopiedb2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libopiemm2.ts b/i18n/zh_TW/libopiemm2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/libopiemm2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libopiepim2.ts b/i18n/zh_TW/libopiepim2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/libopiepim2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/libopieui2.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/libqdasher.ts b/i18n/zh_TW/libqdasher.ts
new file mode 100644
index 0000000..67e35e8
--- a/dev/null
+++ b/i18n/zh_TW/libqdasher.ts
@@ -0,0 +1,9 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>InputMethods</name>
+    <message>
+        <source>Dasher</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index 9be9eda..482b3ec 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -818,109 +818,97 @@ Free some memory and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Apr</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>May</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jun</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jul</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Aug</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sep</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished">錯誤</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">錯誤</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 文件</translation>
     </message>
 </context>
 <context>
     <name>StorageInfo</name>
     <message>
         <source>CF Card</source>
         <translation>CF 卡</translation>
     </message>
     <message>
         <source>Hard Disk</source>
         <translation>硬碟</translation>
     </message>
     <message>
         <source>SD Card</source>
         <translation>SD 卡</translation>
     </message>
     <message>
         <source>SCSI Hard Disk</source>
         <translation>SCSI 硬碟</translation>
     </message>
     <message>
         <source>Internal Storage</source>
         <translation>內部儲存空間</translation>
     </message>
     <message>
         <source>Internal Memory</source>
         <translation>內部記憶體</translation>
     </message>
     <message>
         <source>MMC Card</source>
         <translation>MMC 卡</translation>
     </message>
 </context>
 <context>
     <name>TZCombo</name>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/zh_TW/libtinykate.ts b/i18n/zh_TW/libtinykate.ts
index 332e367..a6f9a43 100644
--- a/i18n/zh_TW/libtinykate.ts
+++ b/i18n/zh_TW/libtinykate.ts
@@ -1,18 +1,971 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>ColorConfig</name>
+    <message>
+        <source>Background:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the editing area</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the background color of the selection. To set the text color for selected text, use the &amp;quot;&lt;b&gt;Configure Highlighting&lt;/b&gt;&amp;quot; dialog.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditConfigTab</name>
+    <message>
+        <source>&amp;Word wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace &amp;tabs with spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Remove trailing spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Auto brackets</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group &amp;undos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Show tabs</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Smart &amp;home</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Page up/down moves cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap &amp;cursor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrap Words At:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tab/Indent Width:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo steps:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encoding:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Word wrap is a feature that causes the editor to automatically start a new line of text and move (wrap) the cursor to the beginning of that new line. KateView will automatically start a new line of text when the current line reaches the length specified by the Wrap Words At: option.&lt;p&gt;&lt;b&gt;NOTE:&lt;b&gt; Word Wrap will not change existing lines or wrap them for easy reading as in some applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Word Wrap option is selected this entry determines the length (in characters) at which the editor will automatically start a new line.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will replace any tabs with the number of spaces indicated in the Tab Width: entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If the Replace Tabs By Spaces option is selected this entry determines the number of spaces with which the editor will automatically replace tabs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KateView will automatically eliminate extra spaces at the ends of lines of text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When the user types a left bracket ([,(, or {) KateView automatically enters the right bracket (}, ), or ]) to the right of the cursor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Checking this will cause sequences of similar actions to be undone at once.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The editor will display a symbol to indicate the presence of a tab in the text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If this is selected, the insertion cursor will be moved to the first/last line when pressing the page up/down buttons.&lt;p&gt;If not selected, it will remain at it&apos;s relative position in the visible text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sets the number of undo/redo steps to record. More steps uses more memory.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When on, moving the insertion cursor using the &lt;b&gt;Left&lt;/b&gt; and &lt;b&gt;Right&lt;/b&gt; keys will go on to previous/next line at beginning/end of the line, similar to most editors.&lt;p&gt;When off, the insertion cursor cannot be moved left of the line start, but it can be moved off the line end, which can be very handy for programmers.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>GotoLineDialog</name>
+    <message>
+        <source>Goto Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Goto Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialog</name>
+    <message>
+        <source>Highlight Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HighlightDialogPage</name>
+    <message>
+        <source>&amp;Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default Item Styles</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Modes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Config Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Item Style</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight Auto Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlight:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File Extensions:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mime Types:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlEditDialog</name>
+    <message>
+        <source>Highlight Conditions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Syntax structure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Context</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New Item</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t find template file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attribute:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>LineEnd:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parameter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Context switch:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete this item</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HlManager</name>
+    <message>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keyword</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Data Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decimal/Value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Base-N Integer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Floating Point</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Character</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Others</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IndentConfigTab</name>
+    <message>
+        <source>&amp;Auto Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent With &amp;Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Backspace Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Tab Key Indents</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Keep Indent &amp;Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Keep Extra Spaces</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When &lt;b&gt;Auto indent&lt;/b&gt; is on, KateView will indent new lines to equal the indent on the previous line.&lt;p&gt;If the previous line is blank, the nearest line above with text is used</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if you want to indent with spaces rather than tabs.&lt;br&gt;A Tab will be converted to &lt;u&gt;Tab-width&lt;/u&gt; as set in the &lt;b&gt;edit&lt;/b&gt; options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;backspace&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This allows the &lt;b&gt;tab&lt;/b&gt; key to be used to indent.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This retains current indentation settings for future documents.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indentations of more than the selected number of spaces will not be shortened.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KDialogBase</name>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KLocale</name>
+    <message>
+        <source>pm</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>am</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>concatenation of dates and time</source>
+        <comment>%1 %2</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <comment>Mon</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <comment>Tue</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <comment>Wed</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <comment>Thu</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <comment>Fri</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <comment>Sat</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <comment>Sun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Monday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Tuesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wednesday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Thursday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Friday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saturday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sunday</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <comment>Jan</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <comment>Feb</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <comment>Mar</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <comment>Apr</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May short</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <comment>Jun</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <comment>Jul</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <comment>Aug</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <comment>Sep</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <comment>Oct</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <comment>Nov</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <comment>Dec</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>January</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>February</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>March</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>April</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>May long</source>
+        <comment>May</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>June</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>July</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>August</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>September</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>October</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>November</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>December</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KMessageBox</name>
+    <message>
+        <source>Sorry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Warning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Information</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateDocument</name>
+    <message>
+        <source>The file %1 has changed on disk.
+Do you want to reload it?
+
+If you cancel you will lose these changes next time you save this file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File has changed on Disk</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KateView</name>
+    <message>
+        <source>Undo/Redo &amp;History...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Configure Editor...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Highlight Mode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Deselect All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invert &amp;Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease Font Sizes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Apply Word Wrap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Editing Co&amp;mmand</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Toggle &amp;Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Bookmarks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;IconBorder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Unindent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Clean Indentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;omment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unco&amp;mment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;End Of Line</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Und&amp;o</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;do</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The current Document has been modified.
+Would you like to save it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not save the document.
+Discard it and continue?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Undo/Redo History</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Continue</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search string &apos;%1&apos; not found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+End of document reached.
+Continue from the beginning?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 replacement(s) made.
+Beginning of document reached.
+Continue from the end?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Configure Editor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Colors</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Indent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Highlighting</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>QObject</name>
     <message>
         <source>Out of Space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There was a problem creating
 KateConfiguration Information 
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ReplacePrompt</name>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace this occurence?</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SearchDialog</name>
+    <message>
+        <source>Find Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Text To Find:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Regular Expression</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Replace Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Replace With:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Options</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>C&amp;ase Sensitive</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Whole Words Only</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;From Beginning</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find &amp;Backwards</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Selected Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Prompt On Replace</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SelectConfigTab</name>
+    <message>
+        <source>&amp;Persistent Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Overwrite Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mouse &amp;Autocopy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;X11-like Single Selection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vertical Selections</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Toggle Old</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this prevents key input or cursor movement by way of the arrow keys from causing the elimination of text selection.&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; If the Overwrite Selections option is activated then any typed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any keyed character input or paste operation will replace the selected text.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>When this is on, any text selected with the mouse will be automatically copied to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not implemented yet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabling this allows you to make vertical selections.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not yet implemented.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>StyleChanger</name>
+    <message>
+        <source>Normal:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Selected:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bold</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Italic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>SyntaxDocument</name>
+    <message>
+        <source>Can&apos;t open %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Other</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>UndoHistory</name>
+    <message>
+        <source>Undo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Redo List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Undo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Redo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 </TS>
diff --git a/i18n/zh_TW/libtodayaddressbookplugin.ts b/i18n/zh_TW/libtodayaddressbookplugin.ts
index 29bd54f..ea68edf 100644
--- a/i18n/zh_TW/libtodayaddressbookplugin.ts
+++ b/i18n/zh_TW/libtodayaddressbookplugin.ts
@@ -13,77 +13,101 @@
         <source>Clip line after X chars: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Days look ahead: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors for the headlines !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Entry Color: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This color will be used for shown birthdays/anniversaries !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set Urgent
 Color if below </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> days: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>To activate settings: Restart application !</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable/Disable Views</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Birthdays</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show &amp;Anniveraries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next birthdays will just be shown, if enabled!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The next anniversaries will just be shown, if enabled !</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>AddressBook plugin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next birthdays in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No birthdays in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Next anniversaries in &lt;b&gt; %1 &lt;/b&gt; days:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No anniversaries in &lt;b&gt; %1 &lt;/b&gt; days!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database does not provide this search query ! Please upgrade libOpie !&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/libtodaydatebookplugin.ts b/i18n/zh_TW/libtodaydatebookplugin.ts
index 05721f2..30c2a58 100644
--- a/i18n/zh_TW/libtodaydatebookplugin.ts
+++ b/i18n/zh_TW/libtodaydatebookplugin.ts
@@ -1,68 +1,65 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DateBookEvent</name>
     <message>
         <source>[with alarm]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>note</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if the note attached to an appointment should be shown for each one</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only later appointments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if only appointments later then current time should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show time in extra line</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointments should be shown maximal. In chronical order</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many appointment should be shown?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>only today</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>How many more days should be in the range</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libtodaytodolistplugin.ts b/i18n/zh_TW/libtodaytodolistplugin.ts
index ed4b5a5..0dbb7ec 100644
--- a/i18n/zh_TW/libtodaytodolistplugin.ts
+++ b/i18n/zh_TW/libtodaytodolistplugin.ts
@@ -1,43 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>QObject</name>
     <message>
         <source>Todolist plugin</source>
         <translation>待辦事項 plugin</translation>
     </message>
     <message>
         <source>There is &lt;b&gt; 1&lt;/b&gt; active task:  &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are &lt;b&gt; %1&lt;/b&gt; active tasks: &lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No active tasks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodoPluginConfigBase</name>
     <message>
         <source>Set the maximum number of task that should be shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>tasks shown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-</context>
 </TS>
diff --git a/i18n/zh_TW/libvtapplet.ts b/i18n/zh_TW/libvtapplet.ts
new file mode 100644
index 0000000..6f7e4d5
--- a/dev/null
+++ b/i18n/zh_TW/libvtapplet.ts
@@ -0,0 +1,13 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>VTApplet</name>
+    <message>
+        <source>VT shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Terminal</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/light-and-power.ts b/i18n/zh_TW/light-and-power.ts
index 4e6f4be..b409b6d 100644
--- a/i18n/zh_TW/light-and-power.ts
+++ b/i18n/zh_TW/light-and-power.ts
@@ -1,57 +1,64 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibration</name>
     <message>
         <source>%1 Steps</source>
         <translation>%1 階</translation>
     </message>
 </context>
 <context>
+    <name>LightSettings</name>
+    <message>
+        <source>Backlight &amp;&amp; Contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>LightSettingsBase</name>
     <message>
         <source>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</source>
         <translation>讓您的裝置發出背光, 螢幕背光是可以自動調整的. 亮度 設定值仍會影響平均的亮度.</translation>
     </message>
     <message>
         <source>Dim light after</source>
         <translation>在此時間後調暗背光</translation>
     </message>
     <message>
         <source>Suspend after</source>
         <translation>在此時間後暫停</translation>
     </message>
     <message>
         <source>Light off after</source>
         <translation>在此時間後關閉背光</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>關</translation>
     </message>
     <message>
         <source>Light and Power Settings</source>
         <translation>背光與電源設定</translation>
     </message>
     <message>
         <source>on Battery</source>
         <translation>使用電池</translation>
     </message>
     <message>
         <source>General Settings</source>
         <translation>一般設定</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> 秒</translation>
     </message>
     <message>
         <source>never</source>
         <translation>永不</translation>
     </message>
     <message>
         <source>Deactivate LCD only (does not suspend)</source>
         <translation>只關閉 LCD (不使用暫停)</translation>
     </message>
     <message>
         <source>Backlight</source>
         <translation>背光</translation>
@@ -67,85 +74,97 @@
     <message>
         <source>Use Light Sensor</source>
         <translation>使用光線偵測器</translation>
     </message>
     <message>
         <source>Calibrate</source>
         <translation>校正</translation>
     </message>
     <message>
         <source>Advanced settings for light sensor handling</source>
         <translation>光線偵測器處理的進階設定</translation>
     </message>
     <message>
         <source>on AC</source>
         <translation>使用外部電源</translation>
     </message>
     <message>
         <source>Warnings</source>
         <translation>警告</translation>
     </message>
     <message>
         <source>Low power warning interval</source>
         <translation>低電量警告間隔</translation>
     </message>
     <message>
         <source> %</source>
         <translation> %</translation>
     </message>
     <message>
         <source>At what battery level should the low power warning pop up</source>
         <translation>電池電量低到什麼程度時要彈出低電量警告</translation>
     </message>
     <message>
         <source>how often should be checked for low power. This determines the rate popups occure in low power situations</source>
         <translation>檢查低電量的頻率. 這也決定了在低電量情形下彈出警告的頻率</translation>
     </message>
     <message>
         <source>At what battery level should the critical power warning pop up</source>
         <translation>電池電量低到什麼程度時要彈出極低電量警告</translation>
     </message>
     <message>
         <source>very low battery warning at</source>
         <translation>非常低電量警告於</translation>
     </message>
     <message>
         <source>critical power warning at</source>
         <translation>極低電量警告於</translation>
     </message>
+    <message>
+        <source>CPU Frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>set a fix value for contrast</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>CPU frequency</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SensorBase</name>
     <message>
         <source>Sensor Calibration</source>
         <translation>偵測器校正</translation>
     </message>
     <message>
         <source>Full</source>
         <translation>全滿</translation>
     </message>
     <message>
         <source>Off</source>
         <translation>關閉</translation>
     </message>
     <message>
         <source>Dark</source>
         <translation>黑</translation>
     </message>
     <message>
         <source>Light</source>
         <translation>亮</translation>
     </message>
     <message>
         <source>Steps</source>
         <translation>階級</translation>
     </message>
     <message>
         <source>Check interval</source>
         <translation>檢查間隔</translation>
     </message>
     <message>
         <source> sec</source>
         <translation> 秒</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/op-qws.ts b/i18n/zh_TW/op-qws.ts
new file mode 100644
index 0000000..f942954
--- a/dev/null
+++ b/i18n/zh_TW/op-qws.ts
@@ -0,0 +1,25 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>SyncAuthentication</name>
+    <message>
+        <source>Sync Connection</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/opie-login.ts b/i18n/zh_TW/opie-login.ts
index f900e1d..cd2cd6b 100644
--- a/i18n/zh_TW/opie-login.ts
+++ b/i18n/zh_TW/opie-login.ts
@@ -6,92 +6,96 @@
 accurately to calibrate your screen.</source>
         <translation>確實而精準地點一下十字準線, 
 以便校正您的螢幕.</translation>
     </message>
     <message>
         <source>Welcome to Opie</source>
         <translation>歡迎使用 Opie</translation>
     </message>
 </context>
 <context>
     <name>LoginWindow</name>
     <message>
         <source>Login</source>
         <translation>登入</translation>
     </message>
     <message>
         <source>&lt;center&gt;Welcome to OPIE&lt;/center&gt;</source>
         <translation>&lt;center&gt;歡迎使用 OPIE&lt;/center&gt;</translation>
     </message>
     <message>
         <source>User</source>
         <translation>使用者</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
         <source>Suspend</source>
         <translation>暫停</translation>
     </message>
     <message>
         <source>Menu</source>
         <translation>選單</translation>
     </message>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>重新啟動</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
         <source>&lt;center&gt;%1 %2&lt;/center&gt;</source>
-        <translation>&lt;center&gt;%1 %2&lt;/center&gt;</translation>
+        <translation type="obsolete">&lt;center&gt;%1 %2&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Wrong password</source>
         <translation>錯誤的密碼</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>輸入的密碼不正確.</translation>
     </message>
     <message>
         <source>OPIE was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="obsolete">OPIE 被沒有抓到的信號
 (%1) 
 中止了</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>失敗</translation>
     </message>
     <message>
         <source>Could not start OPIE.</source>
         <translation type="obsolete">無法啟動 OPIE.</translation>
     </message>
     <message>
         <source>Could not switch to new user identity</source>
         <translation>無法切換為新的使用者身分</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;center&gt;Welcome to OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/opierec.ts b/i18n/zh_TW/opierec.ts
index 7f32700..b0e2c69 100644
--- a/i18n/zh_TW/opierec.ts
+++ b/i18n/zh_TW/opierec.ts
@@ -148,61 +148,65 @@ the selected file?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir Beam out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Location</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>auto Mute</source>
+        <source>mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>mute</source>
+        <source>Stop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Stop</source>
+        <source>Auto Mute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Stereo Channels</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/ordesktop.ts b/i18n/zh_TW/ordesktop.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/ordesktop.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/osearch.ts b/i18n/zh_TW/osearch.ts
index 3cda67d..1bef444 100644
--- a/i18n/zh_TW/osearch.ts
+++ b/i18n/zh_TW/osearch.ts
@@ -12,96 +12,100 @@
     <message>
         <source>Search all</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Case sensitiv</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use wildcards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Applications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Calendar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contacts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Search for: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>execute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>open with </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>show past events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>search in dates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Link: </source>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 0eb61fc..ca9e179 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -1,63 +1,67 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>@default</name>
     <message>
         <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time and Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Personal Information</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>DocTab</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AppLauncher</name>
     <message>
         <source>Application Problem</source>
         <translation type="unfinished">應用程式問題</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;Fast loading has been disabled for this application.  Tap and hold the application icon to reenable it.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;%1&lt;/b&gt; was terminated due to signal code %2&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application terminated</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Application not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not locate application &lt;b&gt;%1&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -185,96 +189,100 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">啟動器</translation>
     </message>
     <message>
         <source> - Launcher</source>
         <translation type="unfinished"> - 啟動器</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">無應用程式</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;沒有可開啟此文件的應用程式&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation type="unfinished">文件</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View as text</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherTabWidget</name>
     <message>
         <source>Icon View</source>
         <translation type="unfinished">圖示瀏覽</translation>
     </message>
     <message>
         <source>List View</source>
         <translation type="unfinished">列表瀏覽</translation>
     </message>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
         <source>%1 files</source>
         <translation type="obsolete">%1 檔案</translation>
     </message>
     <message>
         <source>All types of file</source>
         <translation type="obsolete">所有類型檔案</translation>
     </message>
     <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MediumMountGui</name>
     <message>
         <source>Medium inserted</source>
         <translation type="obsolete">中間插入</translation>
     </message>
     <message>
         <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
         <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="obsolete">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="obsolete">音效</translation>
     </message>
     <message>
         <source>Image</source>
         <translation type="obsolete">圖形</translation>
     </message>
     <message>
         <source>Text</source>
         <translation type="obsolete">文字</translation>
     </message>
     <message>
         <source>Video</source>
@@ -301,181 +309,201 @@ Please charge the back-up battery.</source>
         <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
     </message>
     <message>
         <source>Do not ask again for this medium</source>
         <translation type="obsolete">不再詢問這一個儲存媒体</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Battery Status</source>
         <translation type="obsolete">電池狀態</translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart Qtopia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Help...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Battery level is critical!
 Keep power off until power restored!</source>
-        <translation type="unfinished">低電量警告! 
+        <translation type="obsolete">低電量警告! 
 請把電源關掉直到插上插座</translation>
     </message>
     <message>
         <source>The Back-up battery is very low.
 Please charge the back-up battery.</source>
-        <translation type="unfinished">低電量警告.
+        <translation type="obsolete">低電量警告.
 請換上備份電池</translation>
     </message>
     <message>
         <source>business card</source>
         <translation type="unfinished">business card </translation>
     </message>
     <message>
-        <source>Battery is running very low. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Plugin Manager...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Memory Low
 Please save data.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical Memory Shortage
 Please end this application
 immediately.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The battery level is critical!&lt;p&gt;Keep power off until AC is restored</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The battery is running very low. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;The Back-up battery is very low&lt;p&gt;Please charge the back-up battery</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShutdownImpl</name>
     <message>
         <source>Terminate</source>
         <translation type="unfinished">終止</translation>
     </message>
     <message>
         <source>Terminate Opie</source>
         <translation type="unfinished">終止Opie</translation>
     </message>
     <message>
         <source>Reboot</source>
         <translation type="unfinished">重開機</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation type="unfinished">重新啟動Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished">關機</translation>
     </message>
     <message>
         <source>&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
         <translation type="unfinished">&lt;p&gt;
 These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">同步連結</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="unfinished">&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
+        <translation type="obsolete">&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">沒有權限</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">淮許</translation>
     </message>
+    <message>
+        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
         <source>Syncing</source>
         <translation type="obsolete">同步中</translation>
     </message>
     <message>
         <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
         <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation type="obsolete">&amp;取消</translation>
     </message>
     <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/quicklauncher.ts b/i18n/zh_TW/quicklauncher.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/quicklauncher.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index 6d1b8df..1401aac 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -1,118 +1,263 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Security</name>
     <message>
         <source>Set passcode</source>
         <translation>設定通行碼</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Enter passcode</source>
         <translation>輸入通行碼</translation>
     </message>
     <message>
         <source>Passcode incorrect</source>
         <translation>通行碼不正確</translation>
     </message>
     <message>
         <source>The passcode entered is incorrect.
 Access denied</source>
         <translation>輸入的通行碼不正確.
 存取已拒絕</translation>
     </message>
     <message>
         <source>Any</source>
         <translation>任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Enter new passcode</source>
         <translation>輸入新的通行碼</translation>
     </message>
     <message>
         <source>Re-enter new passcode</source>
         <translation>重新輸入新的通行碼</translation>
     </message>
+    <message>
+        <source>Attention</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>192.168.129.0/24</source>
+        <translation type="unfinished">192.168.129.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.1.0/24</source>
+        <translation type="unfinished">192.168.1.0/24</translation>
+    </message>
+    <message>
+        <source>192.168.0.0/16</source>
+        <translation type="unfinished">192.168.0.0/16</translation>
+    </message>
+    <message>
+        <source>172.16.0.0/12</source>
+        <translation type="unfinished">172.16.0.0/12</translation>
+    </message>
+    <message>
+        <source>10.0.0.0/8</source>
+        <translation type="unfinished">10.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>1.0.0.0/8</source>
+        <translation type="unfinished">1.0.0.0/8</translation>
+    </message>
+    <message>
+        <source>WARNING</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>SecurityBase</name>
     <message>
         <source>Security Settings</source>
         <translation>安全性設定</translation>
     </message>
     <message>
         <source>Change passcode</source>
         <translation>改變通行碼</translation>
     </message>
     <message>
         <source>Clear passcode</source>
         <translation>清除通行碼</translation>
     </message>
     <message>
         <source>Require pass code at power-on</source>
         <translation>在電源開啟時要求輸入通行碼</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>同步化</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>允許來自網路的同步化:</translation>
     </message>
     <message>
         <source>192.168.0.0/16</source>
-        <translation>192.168.0.0/16</translation>
+        <translation type="obsolete">192.168.0.0/16</translation>
     </message>
     <message>
         <source>172.16.0.0/12</source>
-        <translation>172.16.0.0/12</translation>
+        <translation type="obsolete">172.16.0.0/12</translation>
     </message>
     <message>
         <source>10.0.0.0/8</source>
-        <translation>10.0.0.0/8</translation>
+        <translation type="obsolete">10.0.0.0/8</translation>
     </message>
     <message>
         <source>Any</source>
-        <translation>任何</translation>
+        <translation type="obsolete">任何</translation>
     </message>
     <message>
         <source>None</source>
-        <translation>無</translation>
+        <translation type="obsolete">無</translation>
     </message>
     <message>
         <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
         <translation>&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
     </message>
     <message>
         <source>192.168.129.0/24 (default)</source>
-        <translation>192.168.129.0/24 (預設值)</translation>
+        <translation type="obsolete">192.168.129.0/24 (預設值)</translation>
     </message>
     <message>
         <source>192.168.1.0/24</source>
-        <translation>192.168.1.0/24</translation>
+        <translation type="obsolete">192.168.1.0/24</translation>
     </message>
     <message>
         <source>1.0.0.0/8</source>
-        <translation type="unfinished">1.0.0.0/8</translation>
+        <translation type="obsolete">1.0.0.0/8</translation>
     </message>
     <message>
         <source>Passcode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Login Automatically</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>This button will let you change the security passcode.  
+
+Note: This is *not* the sync password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the current passcode.  
+You can enter a new one at any time.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
+
+For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This drop-down list allows you to select the user for auto-login
+(if enabled above).  
+
+You can only select an actually configured user.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select a net-range or enter a new one.  
+
+This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
+
+For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
+
+The entry &quot;All&quot; will allow *any* IP to connect. 
+The entry &quot;None&quot; will *deny* any connection.  
+
+If unsure, select &quot;Any&quot;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete the selected net range from the list
+
+If you press this button, the currently selected net range will be deleted from the list of net ranges.
+
+If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
+the list to the state it has been when you initially booted your Zaurus.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore Defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This button will restore the list of net ranges
+to the defaults.
+
+Beware that all manually entered net ranges will be lost!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select your sync software</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>QTopia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>IntelliSync</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This option changes the login behaviour of the internal FTP server.  
+
+If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
+
+The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Qtopia 1.7</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Opie 1.0</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Both</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/showimg.ts b/i18n/zh_TW/showimg.ts
index 270696a..b99f2e8 100644
--- a/i18n/zh_TW/showimg.ts
+++ b/i18n/zh_TW/showimg.ts
@@ -103,86 +103,83 @@
         <source>%1 colors</source>
         <translation>%1 顏色</translation>
     </message>
     <message>
         <source>%1 alpha levels</source>
         <translation>%1 alpha levels</translation>
     </message>
     <message>
         <source>8-bit alpha channel</source>
         <translation>8-bit alpha channel</translation>
     </message>
     <message>
         <source>Slide show</source>
         <translation>投影片</translation>
     </message>
     <message>
         <source>Stop Slideshow</source>
         <translation>停止投影片</translation>
     </message>
 </context>
 <context>
     <name>InfoDialog</name>
     <message>
         <source>File Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>設定選項</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>投影片</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>每張圖像中的延遲</translation>
     </message>
     <message>
         <source>s</source>
         <translation>s</translation>
     </message>
     <message>
         <source>Repeat slideshow</source>
         <translation>重復投影片</translation>
     </message>
     <message>
         <source>Show pictures in reverse</source>
         <translation>Show pictures in reverse</translation>
     </message>
     <message>
         <source>Load pictures rotated 90 degrees</source>
         <translation>Load pictures rotated 90 degrees</translation>
     </message>
     <message>
         <source>Fast load pictures</source>
         <translation>快速讀取圖片</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sound.ts b/i18n/zh_TW/sound.ts
index b6b1e01..e8fd8da 100644
--- a/i18n/zh_TW/sound.ts
+++ b/i18n/zh_TW/sound.ts
@@ -79,50 +79,54 @@
     <message>
         <source>30</source>
         <translation>30</translation>
     </message>
     <message>
         <source>20</source>
         <translation>20</translation>
     </message>
     <message>
         <source>15</source>
         <translation>15</translation>
     </message>
     <message>
         <source>10</source>
         <translation>10</translation>
     </message>
     <message>
         <source>5</source>
         <translation>5</translation>
     </message>
     <message>
         <source>Sample Rate:</source>
         <translation>取樣頻率</translation>
     </message>
     <message>
         <source>Recording Directory:</source>
         <translation>錄音目錄</translation>
     </message>
     <message>
         <source>Recording Key:</source>
         <translation>啟動錄音鍵</translation>
     </message>
     <message>
         <source>Recording Limit in seconds:</source>
         <translation>錄音秒數限制</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>不限</translation>
     </message>
     <message>
         <source>Restart Opie if needed</source>
         <translation>若需要則重新啟動Opie</translation>
     </message>
     <message>
         <source>Key_Record</source>
         <translation>錄音鍵</translation>
     </message>
+    <message>
+        <source>Use ADPCM compression</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index 97b71e0..4414583 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -50,104 +50,118 @@
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>應用程式CPU使用率 (%)</translation>
     </message>
     <message>
         <source>System CPU usage (%)</source>
         <translation>系統CPU使用率</translation>
     </message>
     <message>
         <source>Type: </source>
         <translation>型號</translation>
     </message>
     <message>
         <source>This page shows how much this device&apos;s processor is being used.</source>
         <translation>本頁顯示處理器資源消耗程度</translation>
     </message>
 </context>
 <context>
     <name>MemoryInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>已使用 (%1 kB)</translation>
     </message>
     <message>
         <source>Buffers (%1 kB)</source>
         <translation>緩衝區 (%1 kB)</translation>
     </message>
     <message>
         <source>Cached (%1 kB)</source>
         <translation>快取區 (%1 kB)</translation>
     </message>
     <message>
         <source>Free (%1 kB)</source>
         <translation>剩餘 (%1 kB)</translation>
     </message>
     <message>
         <source>Total Memory: %1 kB</source>
         <translation>總記憶體： %1 kB</translation>
     </message>
     <message>
         <source>This page shows how memory (i.e. RAM) is being allocated on your handheld device.
 Memory is categorized as follows:
 
 1. Used - memory used to by Opie and any running applications.
 2. Buffers - temporary storage used to improve performance
 3. Cached - information that has recently been used, but has not been freed yet.
 4. Free - memory not currently used by Opie or any running applications.</source>
-        <translation>本頁顯示裝置些記憶體分配情形
+        <translation type="obsolete">本頁顯示裝置些記憶體分配情形
 記憶體使用分類如下：
 
 1. 已使用 - 由Opie及執行的程式所佔用
 2. 緩衝區 - 用來提升系統效能的暫存區
 3. 快取區 - 最近使用過但尚未清除的資訊
 4. 剩餘 - 未被Opie或任何執行程式佔用的記憶體</translation>
     </message>
+    <message>
+        <source>This page shows how memory (i.e. RAM) is being allocated on your device.
+Memory is categorized as follows:
+
+1. Used - memory used to by Opie and any running applications.
+2. Buffers - temporary storage used to improve performance
+3. Cached - information that has recently been used, but has not been freed yet.
+4. Free - memory not currently used by Opie or any running applications.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Total Swap: %1 kB</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ModulesInfo</name>
     <message>
         <source>Module</source>
         <translation>模組</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>大小</translation>
     </message>
     <message>
         <source>Use#</source>
         <translation>Use#</translation>
     </message>
     <message>
         <source>Used By</source>
         <translation type="obsolete">使用者</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
 Click and hold on a module to see additional information about the module, or to unload it.</source>
         <translation>這是現在已載入系統的所有核心模組的清單
 
 點住模組名稱不放即可顯示詳細資訊或卸載該模組</translation>
     </message>
     <message>
         <source>Select a command here and then click the Send button to the right to send the command to module selected above.</source>
         <translation>從選單中選擇指令，再點右側的「送出」鈕即可送出命令給選取的模組</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected command to the module selected above.</source>
         <translation>點下此處即可送出命令給上方已選取的模組</translation>
     </message>
     <message>
         <source>This area shows detailed information about this module.</source>
         <translation>本區顯示模組的詳細資訊</translation>
     </message>
     <message>
         <source>You really want to execute
 </source>
         <translation type="obsolete">您確定要執行？</translation>
     </message>
@@ -178,119 +192,128 @@ Click and hold on a module to see additional information about the module, or to
 <context>
     <name>ProcessInfo</name>
     <message>
         <source>PID</source>
         <translation>PID</translation>
     </message>
     <message>
         <source>Command</source>
         <translation>命令</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>狀態</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>時間</translation>
     </message>
     <message>
         <source>This is a list of all the processes on this handheld device.
 
 Click and hold on a process to see additional information about the process, or to send a signal to it.</source>
         <translation>這是裝置上所有執行中程序的清單
 
 點住程序名稱不放即可顯示詳細資訊或送訊號給它</translation>
     </message>
     <message>
         <source>Select a signal here and then click the Send button to the right to send to this process.</source>
         <translation>由選單中選擇一個訊號，並點下右側的「送出」鈕，即可送訊號給該程序</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>送出</translation>
     </message>
     <message>
         <source>Click here to send the selected signal to this process.</source>
         <translation>點此處以送出選定的訊號給選取的程序</translation>
     </message>
     <message>
         <source>This area shows detailed information about this process.</source>
         <translation>本區顯示選取程序的詳細資料</translation>
     </message>
     <message>
         <source>You really want to send
 </source>
         <translation type="obsolete">您確定要送出？</translation>
     </message>
     <message>
-        <source>You really want to send %1 to this process?</source>
+        <source>Really want to send %1
+to this process?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>系統資訊</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>記憶體</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>儲存空間</translation>
     </message>
     <message>
         <source>CPU</source>
         <translation>中央處理器</translation>
     </message>
     <message>
         <source>Process</source>
         <translation>程序</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>版本</translation>
     </message>
     <message>
         <source>Modules</source>
         <translation>模組</translation>
     </message>
 </context>
 <context>
     <name>VersionInfo</name>
     <message>
         <source>&lt;b&gt;Linux Kernel&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Linux 核心&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Compiled by: </source>
         <translation>編譯者：</translation>
     </message>
     <message>
         <source>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;Version: </source>
         <translation>&lt;b&gt;Opie&lt;/b&gt;&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>Built on: </source>
         <translation>建立日期</translation>
     </message>
     <message>
         <source>&lt;p&gt;Version: </source>
         <translation>&lt;p&gt;版本: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Model: </source>
-        <translation>&lt;p&gt;型號: </translation>
+        <translation type="obsolete">&lt;p&gt;型號: </translation>
     </message>
     <message>
         <source>&lt;p&gt;Vendor: </source>
-        <translation>&lt;p&gt;提供者: </translation>
+        <translation type="obsolete">&lt;p&gt;提供者: </translation>
     </message>
     <message>
         <source>This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device.</source>
         <translation>本頁顯示本裝置上執行的Opie, Linux核心版及發行套件名稱</translation>
     </message>
+    <message>
+        <source>&lt;br&gt;Model: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;br&gt;Vendor: </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/taboapp.ts b/i18n/zh_TW/taboapp.ts
new file mode 100644
index 0000000..4eb9e18
--- a/dev/null
+++ b/i18n/zh_TW/taboapp.ts
@@ -0,0 +1,2 @@
+<!DOCTYPE TS><TS>
+</TS>
diff --git a/i18n/zh_TW/tictac.ts b/i18n/zh_TW/tictac.ts
index 01f0eb5..296cb79 100644
--- a/i18n/zh_TW/tictac.ts
+++ b/i18n/zh_TW/tictac.ts
@@ -1,48 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>TicTacToe</name>
     <message>
         <source>Computer starts</source>
         <translation>電腦先下</translation>
     </message>
     <message>
         <source>Human starts</source>
         <translation>玩家先下</translation>
     </message>
     <message>
         <source>Play!</source>
         <translation>開始!</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>離開</translation>
     </message>
     <message>
         <source>Click Play to start</source>
         <translation>按&quot;開始!&quot;開始遊戲</translation>
     </message>
     <message>
         <source>Make your move</source>
         <translation>輪到你了</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>你贏了!</translation>
     </message>
     <message>
         <source>Computer won!</source>
         <translation>電腦贏了!</translation>
     </message>
     <message>
         <source>It&apos;s a draw</source>
         <translation>不分勝負</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index eedc3a5..e5b12d0 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -1,54 +1,54 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
-        <translation>今日</translation>
+        <translation type="obsolete">今日</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation type="unfinished">所有人</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>請填入個人名片資料</translation>
     </message>
     <message>
         <source>No plugins found</source>
         <translation>找不到plugins</translation>
     </message>
     <message>
         <source>No plugins activated</source>
         <translation>plugins未啟動</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>按此處啟動聯結的應用程式</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
         <translation>今日</translation>
     </message>
     <message>
         <source>Today by Maximilian Rei&#xdf;</source>
         <translation>Today By Maximilian Reiß</translation>
     </message>
     <message>
         <source>Click here to get to the config dialog</source>
         <translation>按此處啟動設定對話視窗</translation>
     </message>
 </context>
 <context>
     <name>TodayConfig</name>
     <message>
         <source>Load which plugins in what order:</source>
         <translation>載入及順序設定</translation>
     </message>
     <message>
         <source>Move Up</source>
         <translation>上移</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 3833e60..6871964 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -165,195 +165,195 @@ The list displays the following information:
         <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="obsolete">正在同步資料中，無法進行編輯</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>&lt;P&gt;%1 new tasks arrived.&lt;p&gt;Would you like to add them to your Todolist?</source>
         <translation type="unfinished">&lt;P&gt;%1 已完成接收新的待辦事項。&lt;p&gt;請問您是否要將其新增至您的待辦事項清單中？</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation type="unfinished">新增待辦事項</translation>
     </message>
     <message>
         <source>C.</source>
         <translation type="unfinished">完成</translation>
     </message>
     <message>
         <source>Priority</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>Configure Templates</source>
         <translation type="unfinished">樣板管理</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished">樣板編輯器</translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished">新增</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished">移除</translation>
     </message>
     <message>
         <source>Name</source>
         <translation type="unfinished">命名</translation>
     </message>
     <message>
         <source>New Template %1</source>
         <translation type="unfinished">新樣板 %1</translation>
     </message>
     <message>
         <source>Click here to set the priority of new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of new task here.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>More</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enter additional information for new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add new task.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to reset new task information.
 
 This area is called the quick task bar.
 
 It allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options-&gt;&apos;Show quick task bar&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can not be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data can&apos;t be edited, currently syncing</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Summary</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>TableView</name>
     <message>
         <source>Table View</source>
         <translation>Table View</translation>
     </message>
     <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>%1 day(s)</source>
         <translation>%1 天</translation>
     </message>
 </context>
 <context>
     <name>TaskEditorAlarms</name>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">編輯</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TaskEditorOverView</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/tonleiter.ts b/i18n/zh_TW/tonleiter.ts
new file mode 100644
index 0000000..e5386b2
--- a/dev/null
+++ b/i18n/zh_TW/tonleiter.ts
@@ -0,0 +1,63 @@
+<!DOCTYPE TS><TS>
+<context>
+    <name>Menu::InstEditDialog</name>
+    <message>
+        <source>Instrument</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add High String</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add Low String</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::MenuWidget</name>
+    <message>
+        <source>Instr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Note</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>show</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Menu::ScaleEditDialog</name>
+    <message>
+        <source>Scale</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/i18n/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index a118074..c6a55e0 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -1,50 +1,309 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>@default</name>
+    <message>
+        <source>ZSafe</source>
+        <translation type="unfinished">ZSafe</translation>
+    </message>
+    <message>
+        <source>Do you want to delete?</source>
+        <translation type="unfinished">Wollen Sie wirklich löschen?</translation>
+    </message>
+    <message>
+        <source>&amp;Delete</source>
+        <translation type="unfinished">&amp;Löschen</translation>
+    </message>
+    <message>
+        <source>D&amp;on&apos;t Delete</source>
+        <translation type="unfinished">&amp;Nicht löschen</translation>
+    </message>
+    <message>
+        <source>Edit Entry</source>
+        <translation type="unfinished">Eintrag ändern</translation>
+    </message>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished">Name</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished">Benutzername</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished">Passwort</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished">Kommentar</translation>
+    </message>
+    <message>
+        <source>Field 4</source>
+        <translation type="unfinished">Feld 4</translation>
+    </message>
+    <message>
+        <source>Field 5</source>
+        <translation type="unfinished">Feld 5</translation>
+    </message>
+    <message>
+        <source>New Entry</source>
+        <translation type="unfinished">Neuer Eintrag</translation>
+    </message>
+    <message>
+        <source>Entry name must be different
+from the category name.</source>
+        <translation type="unfinished">Die Namen der Einträge
+müssen sich von der
+Kategorie unterscheiden.</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished">Suchen</translation>
+    </message>
+    <message>
+        <source>Entry not found</source>
+        <translation type="unfinished">Eintrag nicht gefunden</translation>
+    </message>
+    <message>
+        <source>&amp;OK</source>
+        <translation type="unfinished">&amp;Ok</translation>
+    </message>
+    <message>
+        <source>Field 2</source>
+        <translation type="unfinished">Feld 2</translation>
+    </message>
+    <message>
+        <source>Field 3</source>
+        <translation type="unfinished">Feld 3</translation>
+    </message>
+    <message>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Text</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not remove text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht löschen.</translation>
+    </message>
+    <message>
+        <source>No document defined.
+You have to create a new document</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Export text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Import text file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not export to text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht exportieren.</translation>
+    </message>
+    <message>
+        <source>Could not import text file.</source>
+        <translation type="unfinished">Konnte Textdatei nicht importieren.</translation>
+    </message>
+    <message>
+        <source>Enter Password</source>
+        <translation type="unfinished">Passwort eingeben</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+
+ZSafe will now exit.</source>
+        <translation type="unfinished">Falsches Passwort
+
+ZSafe wird sich jetzt beenden.</translation>
+    </message>
+    <message>
+        <source>Wrong password.
+Enter again?</source>
+        <translation type="unfinished">Falsches Passwort.
+Neu eingeben?</translation>
+    </message>
+    <message>
+        <source>&amp;Yes</source>
+        <translation type="unfinished">&amp;Ja</translation>
+    </message>
+    <message>
+        <source>&amp;No.</source>
+        <translation type="unfinished">&amp;Nein.</translation>
+    </message>
+    <message>
+        <source>Empty document or
+wrong password.
+Continue?</source>
+        <translation type="unfinished">Leeres Dokument oder
+falsches Passwort.
+Fortfahren?</translation>
+    </message>
+    <message>
+        <source>&amp;No</source>
+        <translation type="unfinished">&amp;Nein</translation>
+    </message>
+    <message>
+        <source>&amp;Yes.</source>
+        <translation type="unfinished">&amp;Ja.</translation>
+    </message>
+    <message>
+        <source>Password is empty.
+Please enter again.</source>
+        <translation type="unfinished">Das Passwort ist leer.
+Bitte nochmals eingeben.</translation>
+    </message>
+    <message>
+        <source>Reenter Password</source>
+        <translation type="unfinished">Passwort nochmals eingeben</translation>
+    </message>
+    <message>
+        <source>Passwords must be identical.
+Please enter again.</source>
+        <translation type="unfinished">Die Passwörter müssen
+gleich sein. Bitte nochmals
+Passwort eingeben.</translation>
+    </message>
+    <message>
+        <source>Do you want to save </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+before continuing?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Save</source>
+        <translation type="unfinished">&amp;Sichern</translation>
+    </message>
+    <message>
+        <source>&amp;Don&apos;t Save</source>
+        <translation type="unfinished">&amp;Nicht sichern</translation>
+    </message>
+    <message>
+        <source>Password file saved.</source>
+        <translation type="unfinished">Passwort-Datei gesichert.</translation>
+    </message>
+    <message>
+        <source>Do you want to save
+before exiting?</source>
+        <translation type="unfinished">Wollen Sie vor dem Beenden
+die Daten speichern?</translation>
+    </message>
+    <message>
+        <source>S&amp;ave with
+new
+password</source>
+        <translation type="unfinished">Mit neuem
+&amp;Passwort
+sichern</translation>
+    </message>
+    <message>
+        <source>Category</source>
+        <translation type="unfinished">Kategorie</translation>
+    </message>
+    <message>
+        <source>Wait dialog</source>
+        <translation type="unfinished">Bitte warten</translation>
+    </message>
+    <message>
+        <source>Gathering icons...</source>
+        <translation type="unfinished">Suche nach Symbolen...</translation>
+    </message>
+    <message>
+        <source>Create new ZSafe document</source>
+        <translation type="unfinished">Erzeuge neue ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Now you have to enter
+a password twice for your
+newly created document.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open ZSafe document</source>
+        <translation type="unfinished">Öffne ZSafe Datei</translation>
+    </message>
+    <message>
+        <source>Save ZSafe document as..</source>
+        <translation type="unfinished">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Zaurus Password Manager&lt;br&gt;</source>
+        <translation type="unfinished">Zaurus Passwort Manager&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>by Carsten Schneider&lt;br&gt;</source>
+        <translation type="unfinished">von Carsten Schneider&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Translations by Robert Ernst&lt;br&gt;</source>
+        <translation type="unfinished">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>ZSafe version 2.1.2&lt;br&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Field 6</source>
         <translation>Feld 6</translation>
     </message>
 </context>
 <context>
     <name>InfoForm</name>
     <message>
         <source>Information:</source>
         <translation>Information:</translation>
     </message>
 </context>
 <context>
     <name>NewDialog</name>
     <message>
         <source>New Entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
@@ -246,284 +505,310 @@ ZSafe wird sich jetzt beenden.</translation>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;New</source>
         <translation>&amp;Neu</translation>
     </message>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Ändern</translation>
     </message>
     <message>
         <source>&amp;Delete</source>
         <translation>&amp;Löschen</translation>
     </message>
     <message>
         <source>&amp;Category</source>
         <translation>&amp;Kategorie</translation>
     </message>
     <message>
         <source>&amp;Cut</source>
         <translation>&amp;Ausschneiden</translation>
     </message>
     <message>
         <source>C&amp;opy</source>
         <translation>&amp;Kopieren</translation>
     </message>
     <message>
         <source>&amp;Paste</source>
         <translation>&amp;Einfügen</translation>
     </message>
     <message>
         <source>&amp;Search</source>
         <translation>&amp;Suchen</translation>
     </message>
     <message>
         <source>&amp;Entry</source>
         <translation>&amp;Eintrag</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
-        <translation>Ändern</translation>
+        <translation type="obsolete">Ändern</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation>Löschen</translation>
+        <translation type="obsolete">Löschen</translation>
     </message>
     <message>
         <source>Find</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>New</source>
-        <translation>Neu</translation>
+        <translation type="obsolete">Neu</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
         <source>Comment</source>
         <translation>Kommentar</translation>
     </message>
     <message>
         <source>Field 4</source>
         <translation>Feld 4</translation>
     </message>
     <message>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
-        <translation>Wollen Sie wirklich löschen?</translation>
+        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
-        <translation>&amp;Nicht löschen</translation>
+        <translation type="obsolete">&amp;Nicht löschen</translation>
     </message>
     <message>
         <source>Edit Entry</source>
-        <translation>Eintrag ändern</translation>
+        <translation type="obsolete">Eintrag ändern</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Benutzername</translation>
+        <translation type="obsolete">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Passwort</translation>
+        <translation type="obsolete">Passwort</translation>
     </message>
     <message>
         <source>New Entry</source>
-        <translation>Neuer Eintrag</translation>
+        <translation type="obsolete">Neuer Eintrag</translation>
     </message>
     <message>
         <source>Entry name must be different
 from the category name.</source>
-        <translation>Die Namen der Einträge
+        <translation type="obsolete">Die Namen der Einträge
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Suchen</translation>
+        <translation type="obsolete">Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
-        <translation>Eintrag nicht gefunden</translation>
+        <translation type="obsolete">Eintrag nicht gefunden</translation>
     </message>
     <message>
         <source>&amp;OK</source>
-        <translation>&amp;Ok</translation>
+        <translation type="obsolete">&amp;Ok</translation>
     </message>
     <message>
         <source>Could not remove text file.</source>
-        <translation>Konnte Textdatei nicht löschen.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
     </message>
     <message>
         <source>Could not export to text file.</source>
-        <translation>Konnte Textdatei nicht exportieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
     </message>
     <message>
         <source>Could not import text file.</source>
-        <translation>Konnte Textdatei nicht importieren.</translation>
+        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
     </message>
     <message>
         <source>Enter Password</source>
-        <translation>Passwort eingeben</translation>
+        <translation type="obsolete">Passwort eingeben</translation>
     </message>
     <message>
         <source>Wrong password.
 
 ZSafe will now exit.</source>
-        <translation>Falsches Passwort
+        <translation type="obsolete">Falsches Passwort
 
 ZSafe wird sich jetzt beenden.</translation>
     </message>
     <message>
         <source>Wrong password.
 Enter again?</source>
-        <translation>Falsches Passwort.
+        <translation type="obsolete">Falsches Passwort.
 Neu eingeben?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
-        <translation>&amp;Ja</translation>
+        <translation type="obsolete">&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No.</source>
-        <translation>&amp;Nein.</translation>
+        <translation type="obsolete">&amp;Nein.</translation>
     </message>
     <message>
         <source>Empty document or
 wrong password.
 Continue?</source>
-        <translation>Leeres Dokument oder
+        <translation type="obsolete">Leeres Dokument oder
 falsches Passwort.
 Fortfahren?</translation>
     </message>
     <message>
         <source>&amp;No</source>
-        <translation>&amp;Nein</translation>
+        <translation type="obsolete">&amp;Nein</translation>
     </message>
     <message>
         <source>&amp;Yes.</source>
-        <translation>&amp;Ja.</translation>
+        <translation type="obsolete">&amp;Ja.</translation>
     </message>
     <message>
         <source>Password is empty.
 Please enter again.</source>
-        <translation>Das Passwort ist leer.
+        <translation type="obsolete">Das Passwort ist leer.
 Bitte nochmals eingeben.</translation>
     </message>
     <message>
         <source>Reenter Password</source>
-        <translation>Passwort nochmals eingeben</translation>
+        <translation type="obsolete">Passwort nochmals eingeben</translation>
     </message>
     <message>
         <source>Passwords must be identical.
 Please enter again.</source>
-        <translation>Die Passwörter müssen
+        <translation type="obsolete">Die Passwörter müssen
 gleich sein. Bitte nochmals
 Passwort eingeben.</translation>
     </message>
     <message>
         <source>Password file saved.</source>
-        <translation>Passwort-Datei gesichert.</translation>
+        <translation type="obsolete">Passwort-Datei gesichert.</translation>
     </message>
     <message>
         <source>Do you want to save
 before exiting?</source>
-        <translation>Wollen Sie vor dem Beenden
+        <translation type="obsolete">Wollen Sie vor dem Beenden
 die Daten speichern?</translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation>&amp;Sichern</translation>
+        <translation type="obsolete">&amp;Sichern</translation>
     </message>
     <message>
         <source>S&amp;ave with
 new
 password</source>
-        <translation>Mit neuem
+        <translation type="obsolete">Mit neuem
 &amp;Passwort
 sichern</translation>
     </message>
     <message>
         <source>&amp;Don&apos;t Save</source>
-        <translation>&amp;Nicht sichern</translation>
+        <translation type="obsolete">&amp;Nicht sichern</translation>
     </message>
     <message>
         <source>Category</source>
-        <translation>Kategorie</translation>
+        <translation type="obsolete">Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
-        <translation>Bitte warten</translation>
+        <translation type="obsolete">Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
-        <translation>Suche nach Symbolen...</translation>
+        <translation type="obsolete">Suche nach Symbolen...</translation>
     </message>
     <message>
         <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation>Zaurus Passwort Manager&lt;br&gt;</translation>
+        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
     </message>
     <message>
         <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
         <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
     </message>
     <message>
         <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation>von Carsten Schneider&lt;br&gt;</translation>
+        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
     </message>
     <message>
         <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation>Übersetzungen von Robert Ernst&lt;br&gt;</translation>
+        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
     </message>
     <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
         <source>Create new ZSafe document</source>
-        <translation>Erzeuge neue ZSafe Datei</translation>
+        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
-        <translation>Öffne ZSafe Datei</translation>
+        <translation type="obsolete">Öffne ZSafe Datei</translation>
     </message>
     <message>
         <source>Save ZSafe document as..</source>
-        <translation>Speichere ZSafe Datei als..</translation>
+        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+.../Documents/application
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create directory
+...//Documents/application/zsafe
+
+ZSafe will now exit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit category or entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete category or entry</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
+        <source>Find entry</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>