- make opie-lupdate -noobsolete

795 files changed, 3271 insertions, 52103 deletions

diff --git a/i18n/cz/addressbook.ts b/i18n/cz/addressbook.ts
index 81db97c..e1a8e13 100644
--- a/i18n/cz/addressbook.ts
+++ b/i18n/cz/addressbook.ts
@@ -19,92 +19,24 @@
     <message>
         <source>Unfiled</source>
         <translation>Nevyplněné</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Kontakt</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Zobrazit</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Seznam</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Karta</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nový</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Upravit</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Smazat</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Hledat</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Spustit hledání</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Zavřít hledání</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Napsat Mail pro</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Odeslat položku</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importovat vCard</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Exportovat vCard</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Moje osobní detaily</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Uložit všechna data</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Konfigurace</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Musíte vybrat kontakt!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Musíte zadat jméno souboru!</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Správný typ souboru?</translation>
     </message>
     <message>
@@ -133,28 +65,24 @@ Opravdu ho chcete otevřít?</translation>
         <translation>Opravdu chcete přidat kontakt pro 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Všechny ano</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nelze upravit data, běží synchronizace</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Upravit adresu</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>Upravit moje osobní detaily</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakty - Moje osobní detaily</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Došlo místo</translation>
     </message>
     <message>
@@ -169,36 +97,28 @@ a zkuste to znovu.
 
 Chcete přesto skončit?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nenalezen</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Nelze nalézt kontakt pro tento vyhledávací vzor!</translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation type="obsolete">Karty</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Nevyplněné</translation>
-    </message>
-    <message>
         <source>Edit Contact</source>
         <translation>Upravit kontakt</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Konfigurace</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
diff --git a/i18n/cz/advancedfm.ts b/i18n/cz/advancedfm.ts
index 3543c28..1a13e3b 100644
--- a/i18n/cz/advancedfm.ts
+++ b/i18n/cz/advancedfm.ts
@@ -5,38 +5,24 @@
         <source>AdvancedFm :: </source>
         <translation>AdvancedFm :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation> kB volno</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Takový adresář neexistuje</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Na Advanced FileManager
-má práva 2002-2003
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and je licencován pod GPL</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Zobrazovat skryté soubory</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Změnit adresář</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Provést</translation>
     </message>
     <message>
@@ -99,32 +85,24 @@ and je licencován pod GPL</translation>
         <source>Properties</source>
         <translation>Vlastnosti</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Poslat soubor</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>AdvancedFm</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Nelze odstranit aktuální adresář 
-ze záložek. 
-Není v záložkách!</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Soubor</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Hledání souborů</translation>
     </message>
     <message>
@@ -159,117 +137,48 @@ Není v záložkách!</translation>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Opravdu smazat
-%1 soubory?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Smazat adresář?</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Opravdu smazat %1
-a celý jeho obsah ?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Opravdu smazat 
-%1?</translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Opravdu zkopírovat
-%1 soubory?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Soubor existuje!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 existuje. Ok pro přepsání?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Nelze zkopírovat %1 do %2</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-existuje. Ok pro přepsání?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Nelze zkopírovat</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">do</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Kopírovat</translation>
     </message>
     <message>
         <source> As</source>
         <translation> Jako</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete"> už existuje.
-Opravdu ho chcete smazat?</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Nelze přesunout</translation>
-    </message>
-    <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="obsolete">Nelze zkopírovat 
-%1 
-do 
-%2</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>AdvancedFm Výstup</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Advancedfm Odesílání</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR odesláno.</translation>
     </message>
     <message>
diff --git a/i18n/cz/appearance.ts b/i18n/cz/appearance.ts
index b8a2428..c5a6d23 100644
--- a/i18n/cz/appearance.ts
+++ b/i18n/cz/appearance.ts
@@ -61,64 +61,24 @@ Klikněte sem pro výběr požadovaného schéma.</translation>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klikněte sem pro smazání schéma vybraného ze seznamu vlevo.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Uložit</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klikněte sem pro název a uložení aktuálního schéma.</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Vynutit stylování pro všechny aplikace.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Klikněte sem pro umožnení všem aplikacím používat globální nastavení vzhledu.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Vypnout styl pro tylo aplikace ( &lt;b&gt;*&lt;/b&gt; může být použito jako wildcard):</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Jestliže se některé aplikace nezobrazují korektně s globálním nastavením vzhledu, můžou se určité vlastnosti vypnout pro tuto aplikaci. 
-
-Tato oblast vám umožní vybrat aplikaci a nastavení, která si přejete vypnout.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binární soubor(y)</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Klikněte pro přidání aplikace do seznamu nahoře.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Klikněte pro vymazání aktuálně vybrané aplikace.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Klikněte pro přesunutí aktuálně vybrané aplikace nahoru v seznamu.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Klikněte pro přesunutí aktuálně vybrané aplikace dolů v seznamu.</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Styl záložek:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klikněte sem pro výběr požadovaného stylu záložek oken (jako tato aplikace). K dispozici jsou tyto styly: 
 
@@ -203,28 +163,24 @@ Tato oblast vám umožní vybrat aplikaci a nastavení, která si přejete vypno
         <source>Scheme does already exist.</source>
         <translation>Schéma již existuje.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Smazat schéma</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Nelze smazat aktuální schéma.</translation>
     </message>
     <message>
-        <source>&lt;new&gt;</source>
-        <translation type="obsolete">&lt;nový&gt;</translation>
-    </message>
-    <message>
         <source>Show Scrollbars on the left</source>
         <translation>Zobrazovat posuvník vlevo</translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation>Klikněte pro zobrazování posuvníků na levé straně místo vpravo.</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
diff --git a/i18n/cz/aqpkg.ts b/i18n/cz/aqpkg.ts
index ce28225..f02017d 100644
--- a/i18n/cz/aqpkg.ts
+++ b/i18n/cz/aqpkg.ts
@@ -379,36 +379,24 @@ Modrá tečka s hvězdičkou označuje, že je k dispozici novější verze bal�
 
 Klikněte nalevo do okna pro výběr balíčku.</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Klikněte sem pro odinstalování označených balíčků.</translation>
     </message>
     <message>
-        <source>Building server list:
-%1</source>
-        <translation type="obsolete">Vytvářím serverový seznam:
-%1</translation>
-    </message>
-    <message>
-        <source>Building package list for:
-%1</source>
-        <translation type="obsolete">Vytvářím seznam balíčků pro:
-%1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation>Obnovuji seznamy serverových balíčků</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>VAROVÁNÍ: Aktualizace, pokud 
 běží Opie/Qtopia 
diff --git a/i18n/cz/backup.ts b/i18n/cz/backup.ts
index 2bbddc0..ba3446d 100644
--- a/i18n/cz/backup.ts
+++ b/i18n/cz/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Backup and Restore... pracuje...</translation>
-    </message>
-    <message>
         <source>Error from System:
 </source>
         <translation>Chyba od systému:</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Zpráva</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Zálohování selhalo!</translation>
     </message>
@@ -85,28 +81,24 @@
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Backup And Restore</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Zálohovat</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Uložit jako</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Zálohovat</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikace</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Obnovit</translation>
     </message>
     <message>
@@ -125,47 +117,27 @@
         <source>Locations</source>
         <translation>Umístění</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="obsolete">Uložit</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation>Cíl</translation>
     </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Typ</translation>
-    </message>
-    <message>
-        <source>User Data (Configuration + PIM)</source>
-        <translation type="obsolete">Uživatelská data (Konfigurace + PIM)</translation>
-    </message>
-    <message>
-        <source>Full Backup (Root File System)</source>
-        <translation type="obsolete">Kompletní záloha (Systém souborů root)</translation>
-    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Chybové informace</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Chybová zpráva:</translation>
     </message>
     <message>
diff --git a/i18n/cz/bartender.ts b/i18n/cz/bartender.ts
index d765404..9652b29 100644
--- a/i18n/cz/bartender.ts
+++ b/i18n/cz/bartender.ts
@@ -80,36 +80,28 @@
         <source>New Drink</source>
         <translation>Nový nápoj</translation>
     </message>
     <message>
         <source>Open Drink</source>
         <translation>Otevřít nápoj</translation>
     </message>
     <message>
         <source>Find by Drink Name</source>
         <translation>Hledat dle názvu nápoje</translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="obsolete">Hledat dle alkoholu</translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="obsolete">upravit</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nový</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Otevřít</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Hledat</translation>
     </message>
     <message>
@@ -126,28 +118,24 @@
         <translation>Neúspěšné otevření databáze nápojů.</translation>
     </message>
     <message>
         <source>Search by drink name
 </source>
         <translation>Hledat dle názvu nápoje</translation>
     </message>
     <message>
         <source>Drink Name</source>
         <translation>Název nápoje</translation>
     </message>
     <message>
-        <source>Alcohol</source>
-        <translation type="obsolete">Alkohol</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Sorry no results for
 </source>
         <translation>Žádné výsledky pro</translation>
     </message>
     <message>
         <source>Find by Ingredient</source>
         <translation>Hledat dle ingredience</translation>
     </message>
diff --git a/i18n/cz/calculator.ts b/i18n/cz/calculator.ts
index 0493b8e..764f36e 100644
--- a/i18n/cz/calculator.ts
+++ b/i18n/cz/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Experimental Calculator</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
diff --git a/i18n/cz/calibrate.ts b/i18n/cz/calibrate.ts
index 04efb87..ab40a0e 100644
--- a/i18n/cz/calibrate.ts
+++ b/i18n/cz/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pro zkalibrování obrazovky ukazujte
 přesně na kříže.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Opie vás vítá</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/cz/datebook.ts b/i18n/cz/datebook.ts
index 912d6c6..0d7ed92 100644
--- a/i18n/cz/datebook.ts
+++ b/i18n/cz/datebook.ts
@@ -333,24 +333,32 @@ Chcete přesto skončit?</translation>
     <message>
         <source>Office</source>
         <translation>Kancelář</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Domov</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Toto je každodenní událost.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
diff --git a/i18n/cz/go.ts b/i18n/cz/go.ts
index c7c0264..972c386 100644
--- a/i18n/cz/go.ts
+++ b/i18n/cz/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Remíza.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Nehrál jsem</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Zajatci: černí %1, bílí %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Go</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/cz/gutenbrowser.ts b/i18n/cz/gutenbrowser.ts
index cc9038f..b5f31ff 100644
--- a/i18n/cz/gutenbrowser.ts
+++ b/i18n/cz/gutenbrowser.ts
@@ -23,28 +23,24 @@
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
-        <source>Gutenbrowser Output</source>
-        <translation type="obsolete">Gutenbrowser výstup</translation>
-    </message>
-    <message>
         <source>Running wget</source>
         <translation>Spouštím wget</translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation>Stáhnout Index knihovny, nebo FTP místa?</translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
@@ -230,28 +226,24 @@ http://www.trolltech.com
     <message>
         <source>Home</source>
         <translation>Domů</translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation>Index knihovny - požívá hlavní pg index.</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Error opening local library index:&lt;/P&gt; </source>
-        <translation type="obsolete">&lt;p&gt;Chyba otevření lokálního indexu knihovny:&lt;/P&gt; </translation>
-    </message>
-    <message>
         <source>Library Search</source>
         <translation>Hledání hnihovny</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Stahuji Gutenberg Index....</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Spouštím wget</translation>
     </message>
     <message>
@@ -279,25 +271,25 @@ http://www.trolltech.com
         <translation>G-M</translation>
     </message>
     <message>
         <source>N-R</source>
         <translation>N-R</translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation>S-Z</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation>Otevřít automaticky</translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
@@ -307,24 +299,28 @@ http://www.trolltech.com
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation>&lt;p&gt;Chyba otevření index souboru knihovny. Prosím stáhněte nový.&lt;/P&gt; </translation>
     </message>
+    <message>
+        <source>   </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation>Stažení FTP</translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation>Stahování by mělo brzy začít</translation>
     </message>
     <message>
diff --git a/i18n/cz/kpacman.ts b/i18n/cz/kpacman.ts
index 3f2ad93..4430851 100644
--- a/i18n/cz/kpacman.ts
+++ b/i18n/cz/kpacman.ts
@@ -214,25 +214,29 @@ nebo má neznámý formát.</translation>
         <translation>RNK   SKÓRE  JMÉNO  DATUM</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></translation>
+        <translation type="unfinished"></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>Pixmapu nelze sestavit.
 
 Soubor &apos;@PIXMAPNAME@&apos; neexistuje,
diff --git a/i18n/cz/libaboutapplet.ts b/i18n/cz/libaboutapplet.ts
index ca0e0b3..817ff2f 100644
--- a/i18n/cz/libaboutapplet.ts
+++ b/i18n/cz/libaboutapplet.ts
@@ -2,137 +2,54 @@
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>O aplikaci zkratka</translation>
     </message>
     <message>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">O aplikaci</translation>
-    </message>
-    <message>
-        <source>Authors</source>
-        <translation type="obsolete">Autoři</translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="obsolete">Report</translation>
-    </message>
-    <message>
-        <source>Join</source>
-        <translation type="obsolete">Přidej se</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; je napsán a udržován Opie Teamem, celosvětovou sítí softwarových inženýrů zapojených do free softwarového vývoje.
-&lt;/p&gt;
-&lt;p&gt;
-Žádná skupina, firma, nebo organizace nemá v rukou zdrojový kód Opie. Každý, kdo chce přispívat do Opie, je vítán.
-&lt;/p&gt;
-&lt;p&gt;
-Pro více informaci o projektu Opie navštivte&lt;i&gt;http://opie.handhelds.org&lt;/i&gt;.
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Software může být vždy ještě lepší a team Opie je připraven to udělat. Ale Vy,- uživatel - nám musíte říci, pokud něco nefunguje, jak má, nebo může být uděláno lépe.&lt;/p&gt;
-&lt;p&gt;Open Palmtop Integrated Environment má systém na sledování chyb. Pro nahlášení chyb navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;
-&lt;p&gt;Jestliže máte nějaké návrhy na zlepšení, tak jste vítáni do našeho systému sledování chyb pro zaregistrování vašeho přání. Ujistěte se, že použijete kód závažnosti nazvaný &quot;Feature Wish&quot;.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt; Nemusíte být vývojář software, abyste se stal členem Opie týmu. Můžete se přidat k národním týmům, které překládají uživatelské rozhraní programů. Můžete poskytnout grafiku, témata, zvuky a vylepšenou dokumentaci. Rozhodněte se!&lt;/p&gt;
-&lt;p&gt;Pro informace na kterých projektech můžete spolupracovat, navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;
-&lt;p&gt;Jestliže potřebujete více informací, nebo dokumentaci, tak navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; je napsán a udržován Opie Teamem, celosvětovou sítí softwarových inženýrů zapojených do free softwarového vývoje.
 &lt;/p&gt;
 &lt;p&gt;
 Žádná skupina, firma, nebo organizace nemá v rukou zdrojový kód Opie. Každý, kdo chce přispívat do Opie, je vítán.
 &lt;/p&gt;
 &lt;p&gt;
 Pro více informaci o projektu Opie navštivte&lt;i&gt;http://opie.handhelds.org&lt;/i&gt;.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autoři</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Report</source>
         <translation>Report</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Software může být vždy ještě lepší a team Opie je připraven to udělat. Ale Vy,- uživatel - nám musíte říci, pokud něco nefunguje, jak má, nebo může být uděláno lépe.&lt;/p&gt;
 &lt;p&gt;Open Palmtop Integrated Environment má systém na sledování chyb. Pro nahlášení chyb navštivte &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt;.&lt;/p&gt;
 &lt;p&gt;Jestliže máte nějaké návrhy na zlepšení, tak jste vítáni do našeho systému sledování chyb pro zaregistrování vašeho přání. Ujistěte se, že použijete kód závažnosti nazvaný &quot;Feature Wish&quot;.&lt;/p&gt;</translation>
     </message>
     <message>
diff --git a/i18n/cz/libbatteryapplet.ts b/i18n/cz/libbatteryapplet.ts
index 6cf5edd..4c68f9e 100644
--- a/i18n/cz/libbatteryapplet.ts
+++ b/i18n/cz/libbatteryapplet.ts
@@ -13,28 +13,24 @@
         <source>no data</source>
         <translation>nejsou data</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Nabíjení obou zařízení</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Nabíjení</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Stav baterie</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Stav baterie:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dobrý</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Špatný</translation>
     </message>
     <message>
@@ -53,40 +49,24 @@
         <source>On backup power</source>
         <translation>Na záložním napájení</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Připojeno k síti</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Externí zdroj odpojen</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Do vybití zbývá</translation>
-    </message>
-    <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">Ipaq</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Stav baterie v procentech:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Do vybití zbývá:</translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Košilka</translation>
     </message>
     <message>
         <source>No jacket with battery inserted</source>
         <translation>Nebyla vložena košilka s baterií</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Zbývající energie: %1%</translation>
     </message>
     <message>
diff --git a/i18n/cz/libcable.ts b/i18n/cz/libcable.ts
index 764e519..3792119 100644
--- a/i18n/cz/libcable.ts
+++ b/i18n/cz/libcable.ts
@@ -147,25 +147,21 @@
     <message>
         <source>Hardware</source>
         <translation>Hardwarové</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Softwarové</translation>
     </message>
 </context>
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
-        <translation type="obsolete">Připojení kabelu</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vytvoří sériové, nebo paralelní propojení.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Cable connection</source>
         <translation>Připojení kabelem</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libliquid.ts b/i18n/cz/libliquid.ts
index d29b809..725738b 100644
--- a/i18n/cz/libliquid.ts
+++ b/i18n/cz/libliquid.ts
@@ -1,75 +1,68 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">Kapalina</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Styl kapalina</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Bez průsvitnosti</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>S dolíčky, barva pozadí</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>S dolíčky, barva tlačítek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Průsvitné dolíčky, barva pozadí</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Průsvitné dolíčky, barva tlačítek</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Vlastní průsvitnost</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Barva menu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Barva textu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Neprůsvitnost</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Použít text v menu se stínem</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Plochá tlačítka panelu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Kontrast dolíčků</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Kapalina</translation>
+        <translation type="unfinished">Kapalina</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Vysoce výkonný styl Kapalina od Mosfeta</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libmemoryapplet.ts b/i18n/cz/libmemoryapplet.ts
index 8c2d667..0f029b0 100644
--- a/i18n/cz/libmemoryapplet.ts
+++ b/i18n/cz/libmemoryapplet.ts
@@ -114,28 +114,24 @@ Paměť je kategorizována následovně:
         <source>Manage Swapfile</source>
         <translation>Správa swap souboru</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Vytvořit</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="obsolete">2 MB,4 MB,6 MB,8 MB</translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation>Selhalo odpojení swap souboru.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Soubor swap deaktivován.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Nelze vytvořit swap soubor.</translation>
     </message>
     <message>
diff --git a/i18n/cz/libnetworksettings2.ts b/i18n/cz/libnetworksettings2.ts
index acfe8e0..e5f5303 100644
--- a/i18n/cz/libnetworksettings2.ts
+++ b/i18n/cz/libnetworksettings2.ts
@@ -32,32 +32,24 @@
         <source>Connection Profile</source>
         <translation>Profil připojení</translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle IP packets&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zařízení, která rozumí IP paketům&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle single bytes&lt;/p&gt;</source>
         <translation>&lt;p&gt;Zařízení, která rozumí jednotlivým znakům&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Uzly, které poskytují funkční IP připojení&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Plně nastaven profil připojení&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Nodes that provide working IP connection&lt;/p&gt;</source>
         <translation>&lt;p&gt;Uzly, které poskytují funkční IP připojení&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Fully configured network profile&lt;/p&gt;</source>
         <translation>&lt;p&gt;Plně nakonfigurován síťový profil&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Connection to GPRS device</source>
         <translation>Připojení k GPRS zařízení</translation>
     </message>
     <message>
@@ -79,33 +71,25 @@
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
         <source>Unavailable</source>
         <translation>Nedostupný</translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation>Zablokovaný</translation>
     </message>
     <message>
-        <source>Off</source>
-        <translation type="obsolete">Vypnutý</translation>
-    </message>
-    <message>
         <source>Available</source>
         <translation>Dostupný</translation>
     </message>
     <message>
-        <source>IsUp</source>
-        <translation type="obsolete">Nahozen</translation>
-    </message>
-    <message>
         <source>Inactive</source>
         <translation>Neaktivní</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Aktivní</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libopiecore2.ts b/i18n/cz/libopiecore2.ts
index 85e79f1..b223c02 100644
--- a/i18n/cz/libopiecore2.ts
+++ b/i18n/cz/libopiecore2.ts
@@ -49,28 +49,24 @@
         <source>Upper+Down</source>
         <translation>Horní+Dolů</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Horní+Vpravo</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Horní+Vlevo</translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotace displeje</translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation>Akční tlačítko</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Tlačítko OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Tlačítko End</translation>
     </message>
     <message>
diff --git a/i18n/cz/libopiepim2.ts b/i18n/cz/libopiepim2.ts
index 7176cf6..0c74273 100644
--- a/i18n/cz/libopiepim2.ts
+++ b/i18n/cz/libopiepim2.ts
@@ -216,40 +216,28 @@ and </source>
 </context>
 <context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation>Položka</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vše</translation>
     </message>
     <message>
-        <source>Click here to view all items.</source>
-        <translation type="obsolete">Klikněte pro zobrazení všech položek.</translation>
-    </message>
-    <message>
-        <source>Click here to view items belonging to %1.</source>
-        <translation type="obsolete">Klikněte pro zobrazení položek patřících k %1.</translation>
-    </message>
-    <message>
         <source>Unfiled</source>
         <translation>Nezařazené</translation>
     </message>
     <message>
-        <source>Click here to view all unfiled items.</source>
-        <translation type="obsolete">Klikněte pro zobrazení všech nezařazených položek.</translation>
-    </message>
-    <message>
         <source>View</source>
         <translation>Zobrazit</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Nová</translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation>Klikněte pro vytvoření nové položky.</translation>
     </message>
     <message>
@@ -276,56 +264,32 @@ and </source>
         <source>Click here to delete the selected item.</source>
         <translation>Klikněte pro smazání vybrané položky.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Odeslat</translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation>Klikněte pro odeslání vybrané položky.</translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="obsolete">Hledat</translation>
-    </message>
-    <message>
-        <source>Click here to search for an item.</source>
-        <translation type="obsolete">Klkněte pro hledání položky.</translation>
-    </message>
-    <message>
         <source>Configure</source>
         <translation>Konfigurovat</translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation>Klikněte pro nastavení vašich preferencí této aplikace.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="obsolete">Filtrovat</translation>
-    </message>
-    <message>
-        <source>Click here to filter the items displayed.</source>
-        <translation type="obsolete">Klikněte pro filtrování zobrazených položek.</translation>
-    </message>
-    <message>
-        <source>Filter Settings</source>
-        <translation type="obsolete">Nastavení filtru</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current filter settings.</source>
-        <translation type="obsolete">Klikněte pro změnu aktuálního nastavení filtru.</translation>
-    </message>
-    <message>
         <source>Click here to filter items by category.</source>
         <translation>Klikněte pro filtrování položek dle kategorie.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation>Popis:</translation>
     </message>
     <message>
         <source>Priority:</source>
diff --git a/i18n/cz/libopiesecurity2.ts b/i18n/cz/libopiesecurity2.ts
index 7ae92dc..b64beb6 100644
--- a/i18n/cz/libopiesecurity2.ts
+++ b/i18n/cz/libopiesecurity2.ts
@@ -1,44 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="obsolete">Vítejte v systému Multi-autentizace Opie</translation>
-    </message>
-    <message>
         <source>Launching authentication plugins...</source>
         <translation>Spouštím autentizační pluginy...</translation>
     </message>
     <message>
         <source>Proceed...</source>
         <translation>Pokračovat...</translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="obsolete">Poznámka: pro opravdovou ochranu by mělo být tlačítko &apos;exit&apos; odstraněno v okně bezpečnostního nastavení</translation>
-    </message>
-    <message>
         <source>Congratulations! Your authentication has been successful.</source>
         <translation>Gratuluji! Vaše ověření proběhlo úspěšně.</translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
-        <translation type="obsolete">Nemáte dostatek úspěšných autentizačních kroků!</translation>
-    </message>
-    <message>
-        <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
-        <translation type="obsolete">Poznámka: Jestliže nemáte zaškrtnutý  &apos;Povolit obejití&apos; v konfiguraci bezpečnosti, měli byste jít zpět skrz všechny kroky.</translation>
-    </message>
-    <message>
         <source>Welcome to Opie</source>
         <translation>Vítejte v prostředí Opie</translation>
     </message>
     <message>
         <source>Note: this &apos;exit&apos; button only appears during &lt;b&gt;simulations&lt;/b&gt;, like the one we are in. If you don&apos;t succeed a step, remember you can &lt;b&gt;skip&lt;/b&gt; it.</source>
         <translation>Poznámka: toto &apos;exit&apos; tlačítko se objeví pouze během &lt;b&gt;simulací&lt;/b&gt;, jako je teď. Jestliže nedokončíte krok, pamatujte, že ho můžete &lt;b&gt;přeskočit&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation>&lt;b&gt;Neprošli&lt;/b&gt; jste úspěšně dostatek ověřovacích kroků!</translation>
     </message>
     <message>
diff --git a/i18n/cz/libopieui2.ts b/i18n/cz/libopieui2.ts
index 86b86e1..5eedd79 100644
--- a/i18n/cz/libopieui2.ts
+++ b/i18n/cz/libopieui2.ts
@@ -1,48 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Okno souboru</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Otevřít</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Uložit</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="obsolete">Vyberte adresář</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Styl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Velikost</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Příliš žluťoučký kůň úpěl ďábelské ódy</translation>
-    </message>
-</context>
-<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation>Dialog výběru času</translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Čas:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
diff --git a/i18n/cz/libppp.ts b/i18n/cz/libppp.ts
index e5efd24..59e3ad0 100644
--- a/i18n/cz/libppp.ts
+++ b/i18n/cz/libppp.ts
@@ -183,40 +183,24 @@
     <message>
         <source>Commands</source>
         <translation>Příkazy</translation>
     </message>
     <message>
         <source>Dialing</source>
         <translation>Vytáčení</translation>
     </message>
 </context>
 <context>
     <name>PPPIPEdit</name>
     <message>
-        <source>IPAddress needed</source>
-        <translation type="obsolete">IP adresa je vyžadována</translation>
-    </message>
-    <message>
-        <source>IPAddress not valid</source>
-        <translation type="obsolete">IP adresa je neplatná</translation>
-    </message>
-    <message>
-        <source>Subnet mask needed</source>
-        <translation type="obsolete">Síťová maska je vyžadována</translation>
-    </message>
-    <message>
-        <source>Subnet mask not valid</source>
-        <translation type="obsolete">Síťová maska je neplatná</translation>
-    </message>
-    <message>
         <source>Gateway address needed</source>
         <translation>Adresa brány je vyžadována</translation>
     </message>
     <message>
         <source>Gateway address not valid</source>
         <translation>Adresa brány je neplatná</translation>
     </message>
 </context>
 <context>
     <name>PPPIPGUI</name>
     <message>
         <source>PPPIP</source>
@@ -226,28 +210,24 @@
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation>Přiděluje server</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Pevná</translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="obsolete">Síťová maska</translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Brána</translation>
     </message>
     <message>
         <source>Set as default</source>
         <translation>Nastavit jako výchozí</translation>
     </message>
     <message>
@@ -261,28 +241,24 @@
     <message>
         <source>Remote</source>
         <translation>Vzdálený</translation>
     </message>
     <message>
         <source>Only if not yet set</source>
         <translation>Jen, když nebylo už nastaveno</translation>
     </message>
 </context>
 <context>
     <name>PPPNetNode</name>
     <message>
-        <source>PPP Connection</source>
-        <translation type="obsolete">PPP připojení</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nastaví IP s použitím PPP.&lt;/p&gt;&lt;p&gt;Použijte pro vytáčené, nebo sériové připojení&lt;/p&gt;</translation>
     </message>
     <message>
         <source>PPP connection</source>
         <translation>PPP připojení</translation>
     </message>
 </context>
 <context>
     <name>PPPRunGUI</name>
     <message>
         <source>PPPRun</source>
diff --git a/i18n/cz/libprofile.ts b/i18n/cz/libprofile.ts
index 2886752..2bb712b 100644
--- a/i18n/cz/libprofile.ts
+++ b/i18n/cz/libprofile.ts
@@ -13,28 +13,24 @@
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Automatically</source>
         <translation>Automaticky</translation>
     </message>
     <message>
         <source>Ask</source>
         <translation>Na dotaz</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Vypnuto</translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation>Spustit VPN</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Popis</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Stav</translation>
     </message>
     <message>
@@ -101,32 +97,24 @@
         <source>Errors</source>
         <translation>Chyby</translation>
     </message>
     <message>
         <source>Dropped</source>
         <translation>Zahozeno</translation>
     </message>
     <message>
         <source>Bytes</source>
         <translation>Bajtů</translation>
     </message>
     <message>
-        <source>Transmitting</source>
-        <translation type="obsolete">Odesílání</translation>
-    </message>
-    <message>
-        <source>Others</source>
-        <translation type="obsolete">Ostatní</translation>
-    </message>
-    <message>
         <source>Collisions</source>
         <translation>Kolize</translation>
     </message>
     <message>
         <source>Live feed </source>
         <translation>Živý posun</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Zapnuto</translation>
     </message>
     <message>
diff --git a/i18n/cz/libtodayaddressbookplugin.ts b/i18n/cz/libtodayaddressbookplugin.ts
index 3e16158..c0a42a7 100644
--- a/i18n/cz/libtodayaddressbookplugin.ts
+++ b/i18n/cz/libtodayaddressbookplugin.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Pro aktivaci nastavení restartujte aplikaci!</translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation>Zapnout/Vypnout Zobrazení</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Ukazovat &amp;narozeniny</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>Ukazovat &amp;výročí</translation>
     </message>
     <message>
@@ -25,32 +21,24 @@
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Při zapnutí budou zobrazovány následující výročí!</translation>
     </message>
     <message>
         <source>Max Lines: </source>
         <translation>Maximálně řádek:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Nastaví maximální počet řádek, které budou zobrazeny u jednotlivých výročí/narozenin</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="obsolete">Ukončí řádek po X znacích:</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Po kolika znacích bude informace o události ukončena</translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation>Kolik dnů se dívat vpřed:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Kolik dnů by se mělo hledat dopředu</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Nastavení barvy nadpisu:</translation>
     </message>
     <message>
diff --git a/i18n/cz/libtodayweatherplugin.ts b/i18n/cz/libtodayweatherplugin.ts
index 174406f..a9784c6 100644
--- a/i18n/cz/libtodayweatherplugin.ts
+++ b/i18n/cz/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Tlak:</translation>
         <source>SE </source>
         <translation>JV</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>KPH</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>MPH</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation>kPa</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libvpn.ts b/i18n/cz/libvpn.ts
index 0dac02c..da4a5dd 100644
--- a/i18n/cz/libvpn.ts
+++ b/i18n/cz/libvpn.ts
@@ -16,25 +16,21 @@
     <message>
         <source>Start automatically</source>
         <translation>Spustit automaticky</translation>
     </message>
     <message>
         <source>Confirm before start</source>
         <translation>Potvrdit před spuštěním</translation>
     </message>
 </context>
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
-        <translation type="obsolete">VPN připojení</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
         <translation>&lt;p&gt;Nastaví privátní IP připojení.&lt;/p&gt;&lt;p&gt;Definuje bezpečné tunely přes nebezpečnou IP síť&lt;/p&gt;</translation>
     </message>
     <message>
         <source>VPN connection</source>
         <translation>VPN připojení</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/libwlan.ts b/i18n/cz/libwlan.ts
index 8cdaaa2..37877b1 100644
--- a/i18n/cz/libwlan.ts
+++ b/i18n/cz/libwlan.ts
@@ -1,305 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation>&lt;PoužítJménoHostitele&gt;</translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">Bezdrátová konfigurace</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Hlavní</translation>
+        <translation type="unfinished">Hlavní</translation>
     </message>
     <message>
         <source>any</source>
-        <translation type="obsolete">jakýkoliv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation type="obsolete">SSID</translation>
+        <translation type="unfinished">SSID</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation type="obsolete">Infrastruktura</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation type="obsolete">Auto</translation>
+        <translation type="unfinished">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation type="obsolete">Řízeno</translation>
+        <translation type="unfinished">Řízeno</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation type="obsolete">Ad-Hoc</translation>
+        <translation type="unfinished">Ad-Hoc</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Režim</translation>
+        <translation type="unfinished">Režim</translation>
     </message>
     <message>
         <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">Určete &amp;Access Point</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
+        <translation type="unfinished">MAC</translation>
     </message>
     <message>
         <source>Specify &amp;Channel</source>
-        <translation type="obsolete">Určete &amp;kanál</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation type="obsolete">Proskenovat okolí</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation type="obsolete">Kanál</translation>
+        <translation type="unfinished">Kanál</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation type="obsolete">Šifrování</translation>
+        <translation type="unfinished">Šifrování</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">&amp;Zapnout šifrování</translation>
+        <translation type="unfinished">&amp;Zapnout šifrování</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation type="obsolete">Nastavení &amp;klíčů</translation>
+        <translation type="unfinished">Nastavení &amp;klíčů</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation type="obsolete">Klíč &amp;1</translation>
+        <translation type="unfinished">Klíč &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation type="obsolete">Klíč &amp;2</translation>
+        <translation type="unfinished">Klíč &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation type="obsolete">Klíč &amp;3</translation>
+        <translation type="unfinished">Klíč &amp;3</translation>
     </message>
     <message>
         <source>Key &amp;4</source>
-        <translation type="obsolete">Klíč &amp;4</translation>
+        <translation type="unfinished">Klíč &amp;4</translation>
     </message>
     <message>
         <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Nezašifrované pakety</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Akceptovat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Reject</source>
-        <translation type="obsolete">&amp;Odmítnout</translation>
-    </message>
-</context>
-<context>
-    <name>WLanGUI</name>
-    <message>
-        <source>General</source>
-        <translation>Hlavní</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation>Řízeno</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation>Režim</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation>MAC</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation>Šifrování</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation>&amp;Zapnout šifrování</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation>Nastavení &amp;klíčů</translation>
-    </message>
-    <message>
-        <source>Key &amp;1</source>
-        <translation>Klíč &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation>Klíč &amp;4</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation>Klíč &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation>Klíč &amp;3</translation>
-    </message>
-    <message>
-        <source>AP</source>
-        <translation>AP</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation>Rychlost</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Kanál</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation>Stanice</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation>ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation>Šum</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation>Kvalita</translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation>Signál</translation>
-    </message>
-    <message>
-        <source>SSID</source>
-        <translation>SSID</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation>Kanál</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Jméno</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation>ESS-ID</translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation>&lt;PoužítJménoHostitele&gt;</translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation>Specifikovat přístupový bod</translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation>Skenovat</translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation>Akceptovat nešifrované pakety</translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation>Stav</translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation>Frekv</translation>
-    </message>
-    <message>
-        <source>Link Quality</source>
-        <translation>Kvalita spojení</translation>
-    </message>
-    <message>
-        <source>Live feed </source>
-        <translation>Živý posuv</translation>
-    </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
-    <message>
-        <source>WLan Device</source>
-        <translation>WLan zařízení</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Konfiguruje Wi/Fi, nebo WLan síťové karty.&lt;/p&gt;&lt;p&gt;Definuje bezdrátové možnosti těchto karet&lt;/p&gt;</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Informace o rozhraní</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">Kanál</translation>
+        <translation type="unfinished">Kanál</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Režim</translation>
+        <translation type="unfinished">Režim</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Stanice</translation>
+        <translation type="unfinished">Stanice</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">AP</translation>
+        <translation type="unfinished">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Rychlost</translation>
+        <translation type="unfinished">Rychlost</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Kvalita</translation>
+        <translation type="unfinished">Kvalita</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Šum</translation>
+        <translation type="unfinished">Šum</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Signál</translation>
+        <translation type="unfinished">Signál</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/mindbreaker.ts b/i18n/cz/mindbreaker.ts
index 81c5703..6037d59 100644
--- a/i18n/cz/mindbreaker.ts
+++ b/i18n/cz/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>výher prům: %1 kol (%2 her)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation>Drtič mysli</translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Go%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">CurrentGo%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Answer%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Resetovat statistiky</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Resetovat poměr výher?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
diff --git a/i18n/cz/opie-console.ts b/i18n/cz/opie-console.ts
index 025b675..913eb22 100644
--- a/i18n/cz/opie-console.ts
+++ b/i18n/cz/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>Synchronizovaný soubor</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Vytáčím číslo: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Selhání</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Vytočení čísla selhalo.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Stornování...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Hledám modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Inicializace...</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Typ terminálu</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Barevné schéma</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Velikost písma</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">malé</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">střední</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">velké</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Převod konců řádků</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Příchozí</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Odchozí</translation>
     </message>
     <message>
diff --git a/i18n/cz/opie-eye.ts b/i18n/cz/opie-eye.ts
index 9353017..356bdd5 100644
--- a/i18n/cz/opie-eye.ts
+++ b/i18n/cz/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation>Velikost zmenšenin:</translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation>Zobrazit panel při spuštění</translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation>Uložit stav celé obrazovky/autorotace</translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation>Zobrazit info o obrázku</translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation>Přepnutí auto-rotace</translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation>Přepnout na předchozí obrázek</translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation>Přepnout celou obrazovku</translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation>Přepnout zmenšeninu</translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation>Zobrazit jako</translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation>Odeslat aktuální položku</translation>
     </message>
     <message>
@@ -75,47 +87,39 @@
         <source>View Current Item</source>
         <translation>Zobrazit aktuální položku</translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation>Zobrazit informace o obrázku</translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation>Smazat obrázek</translation>
     </message>
     <message>
-        <source>the Image %1</source>
-        <translation type="obsolete">Obrázek %1</translation>
-    </message>
-    <message>
         <source>Image</source>
         <translation>Obrázek</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Spustit slideshow</translation>
     </message>
     <message>
         <source>the Image</source>
         <translation>Obrázek</translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
-        <translation type="obsolete">Konfigurace - Phunk View</translation>
-    </message>
-    <message>
         <source>Browser Keyboard Actions</source>
         <translation>Projít akce klávesnice</translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation>Konfigurace klávesnice</translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation>Opie Eye - Konfigurace</translation>
     </message>
     <message>
@@ -205,45 +209,49 @@
     <message>
         <source>Select filesystem</source>
         <translation>Vybrat systém souborů</translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation>Režim zobrazení seznamu</translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation>Neukazovat rozdělená okna</translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation>%1 - O View</translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
-        <translation type="obsolete">Opie Eye Caramba</translation>
-    </message>
-    <message>
         <source>Show all files</source>
         <translation>Zobrazit všechny soubory</translation>
     </message>
     <message>
-        <source>DirView</source>
-        <translation type="obsolete">Adresáře</translation>
-    </message>
-    <message>
         <source>Opie Eye</source>
         <translation>Opie Eye</translation>
     </message>
     <message>
         <source>DocView</source>
         <translation>Zobrazení dokumentace</translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation>Zobrazení adresáře</translation>
     </message>
     <message>
@@ -269,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation>Chyba, adresář s foťákem neexistuje</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Opravdu chcete smazat %1&lt;br&gt; %2?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation>Potvrzení smazání</translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Zmenšenina a informace o obrázku</translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation>Zmenšenina a jméno</translation>
     </message>
     <message>
diff --git a/i18n/cz/opie-eye_slave.ts b/i18n/cz/opie-eye_slave.ts
index 3d3dc38..e4ce8fa 100644
--- a/i18n/cz/opie-eye_slave.ts
+++ b/i18n/cz/opie-eye_slave.ts
@@ -135,174 +135,24 @@
     </message>
     <message>
         <source>Compression: %1
 </source>
         <translation>Komprese: %1</translation>
     </message>
     <message>
         <source>InterlaceMode: %1
 </source>
         <translation>Prokládaný režim: %1</translation>
     </message>
     <message>
-        <source>Colormode: Color
-</source>
-        <translation type="obsolete">Režim barev: Barevný</translation>
-    </message>
-    <message>
-        <source>Colormode: Black and white
-</source>
-        <translation type="obsolete">Režim barev: Černobílý</translation>
-    </message>
-    <message>
-        <source>Basic</source>
-        <translation type="obsolete">Základní</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normální</translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="obsolete">Jemný</translation>
-    </message>
-    <message>
-        <source>Quality: %1
-</source>
-        <translation type="obsolete">Kvalita: %1</translation>
-    </message>
-    <message>
-        <source>Daylight</source>
-        <translation type="obsolete">Denní světlo</translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="obsolete">Zářivka</translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="obsolete">Žárovka</translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="obsolete">Standardní světlo A</translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="obsolete">Standardní světlo B</translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="obsolete">Standardní světlo C</translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="obsolete">D55</translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="obsolete">D65</translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="obsolete">D75</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="obsolete">Jiné</translation>
-    </message>
-    <message>
-        <source>White Balance: %1
-</source>
-        <translation type="obsolete">Balance bílé: %1</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">Průměr</translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="obsolete">Středově vážený průměr</translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="obsolete">Bodové</translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="obsolete">Vícebodové</translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="obsolete">Vzorec</translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="obsolete">Částečný</translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
-</source>
-        <translation type="obsolete">Režim měření: %1</translation>
-    </message>
-    <message>
-        <source>Not defined</source>
-        <translation type="obsolete">Nedefinován</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manuální</translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="obsolete">Normální program</translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="obsolete">Priorita clony</translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="obsolete">Priorita času</translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="obsolete">Kreativní program 
-(používá větší rychlost závěrky)</translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="obsolete">Akční program
-(používá větší rychlost závěrky)</translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="obsolete">Režim portrét 
-(Pro blízké snímky s rozostřeným pozadím)</translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="obsolete">Režim krajina 
-(pro snímky krajiny se zaostřeným pozadím)</translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
-</source>
-        <translation type="obsolete">Expoziční program: %1</translation>
-    </message>
-    <message>
         <source>Date/Time: %1
 </source>
         <translation>Datum/Čas: %1</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Comment: %1
 </source>
         <translation>&lt;qt&gt;Komentář: %1</translation>
     </message>
     <message>
         <source>Manufacturer: %1
 </source>
diff --git a/i18n/cz/opie-login.ts b/i18n/cz/opie-login.ts
index 336ff7e..69c8385 100644
--- a/i18n/cz/opie-login.ts
+++ b/i18n/cz/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pro kalibraci obrazovky ukazujte
 přesně na kříže.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Vítá vás 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;Vítá vás OPIE&lt;/center&gt;</translation>
     </message>
     <message>
@@ -41,28 +37,24 @@ přesně na kříže.</translation>
 </context>
 <context>
     <name>LoginWindowImpl</name>
     <message>
         <source>Restart</source>
         <translation>Restart</translation>
     </message>
     <message>
         <source>Quit</source>
         <translation>Konec</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="obsolete">&lt;center&gt;Vítá vás OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>Wrong password</source>
         <translation>Chybné heslo</translation>
     </message>
     <message>
         <source>The given password is incorrect.</source>
         <translation>Zadané heslo je chybné.</translation>
     </message>
     <message>
         <source>Opie was terminated
 by an uncaught signal
 (%1)
 </source>
diff --git a/i18n/cz/opieirc.ts b/i18n/cz/opieirc.ts
index 9ca7ce7..3e9371e 100644
--- a/i18n/cz/opieirc.ts
+++ b/i18n/cz/opieirc.ts
@@ -65,28 +65,24 @@
         <source>Talking on channel</source>
         <translation>Konverzace na kanálu</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Diskuse na kanálu</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Sem pište zprávu pro přispění do diskuse na kanálu</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Verze</translation>
     </message>
     <message>
@@ -182,60 +178,44 @@
         <source>Channel message with unknown sender</source>
         <translation>Kanálová zpráva s neznámým odesílatelem</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Kanálová zpráva s neznámým kanálem %1</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Přijata PRIVMSG neznámého typu</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">Přejmenoval jste se na %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 se přejmenoval na %2</translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Změna přezdívky neznámé osoby</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 odešel (%2)</translation>
     </message>
     <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Neznámý odchod osoby - rozsynchronizováno?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>Změněno téma na</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Neznámé téma kanálu - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Přijatý CTCP PING od</translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">Přijato CTCP VERSION od</translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION s neznámou osobou - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION s neznámým kanálem - rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION se špatným příjemcem</translation>
     </message>
     <message>
@@ -380,28 +360,24 @@ Skutečné jméno: %4</translation>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation>CTCP PING s neznámým kanálem - Rozsynchronizováno?</translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation>CTCP PING se špatným příjemcem</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation>Přijata CTCP VERSION žádost od</translation>
     </message>
     <message>
-        <source>Malformed DCC request from </source>
-        <translation type="obsolete">Zdeformovaná DCC žádost od</translation>
-    </message>
-    <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation>Přijata odpověď na CTCP PING od %1: %2 sekund</translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation>Přijata žádost na CTCP PING od %1</translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation>Zdeformována DCC žádost od %1</translation>
     </message>
     <message>
@@ -494,36 +470,28 @@ Skutečné jméno: %4</translation>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Název profilu je vyžadován</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Název hostitele je vyžadován</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">Port je vyžadován</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>Přezdívka se vyžaduje</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">Skutečné jméno se vyžaduje</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>Seznam kanálů musí obsahovat
 jejich názvy oddělené čárkami
 a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -556,28 +524,24 @@ a nezačínající na &apos;#&apos; nebo &apos;+&apos;</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Upravit označený profil serveru</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Přidat nový profil serveru</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Připojení k</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Zprávy serveru</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Zde pište příkazy. Seznam příkazů je v nápovědě k OpieIRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation>Připojování k</translation>
     </message>
 </context>
diff --git a/i18n/cz/opiemail.ts b/i18n/cz/opiemail.ts
index 3fafb53..af6ec32 100644
--- a/i18n/cz/opiemail.ts
+++ b/i18n/cz/opiemail.ts
@@ -70,28 +70,24 @@
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Prosím vyberte soubor.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation>Odesílám zprávu</translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="obsolete">Nebyl specifikován příjemce</translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation>Uložit zprávu</translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation>Uložit zprávu do konceptů?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Ano</translation>
     </message>
     <message>
@@ -328,24 +324,76 @@
     <message>
         <source>Sender</source>
         <translation>Odesílatel</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">Server</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished">Vytvořit novou složku</translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation>Přihlášené novinky</translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -355,32 +403,24 @@
         <source>Newsgroups</source>
         <translation>Novinky</translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation>Seznam skupin ze serveru. Na začátku budou zobrazeny pouze přihlášené skupiny.</translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation>Filtr skupin:</translation>
     </message>
     <message>
-        <source>Enter a filter string here.
-Then hit &quot;get newsgroup list&quot; again and only groups starting 
-with that filter will be listet.</source>
-        <translation type="obsolete">Sem zadejte filtrovací řetězec.
-Potom klikněte na &quot;stáhnout seznam skupin&quot; znovu a zobrazí se vám 
-pouze skupiny začínající filtrem.</translation>
-    </message>
-    <message>
         <source>Get newsgroup list from server</source>
         <translation>Stáhnout seznam skupin ze serveru</translation>
     </message>
     <message>
         <source>Retrieve the list of groups from server</source>
         <translation>Přetáhnout seznam skupin ze serveru</translation>
     </message>
     <message>
         <source>Enter a filter string here.
 Then hit &quot;get newsgroup list&quot; again and only groups starting 
 with that filter will be listed.</source>
         <translation>Sem zadejte řetězec filtru.
@@ -667,34 +707,31 @@ skupiny začínající tímto filtrem.</translation>
     <message>
         <source>Check how often</source>
         <translation>Jak často zkoušet</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Blikat LED při příchodu nové zprávy</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Zahrát zvuk při příchodu nové zprávy</translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
-        <translation>TextLabel1</translation>
+        <source>Click activate server/folder</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Zobrazit Text</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Uložit přílohu</translation>
     </message>
@@ -737,32 +774,36 @@ skupiny začínající tímto filtrem.</translation>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Opravdu chcete smazat tuto zprávu? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation>Zobrazit náhled obrázku</translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation>E-Mail podle %1</translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
-        <source>E-Mail by %1</source>
-        <translation type="obsolete">E-Mail podle %1</translation>
-    </message>
-    <message>
         <source>Mail</source>
         <translation>Zpráva</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Odpověď</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Přesměrování</translation>
     </message>
     <message>
@@ -784,24 +825,28 @@ skupiny začínající tímto filtrem.</translation>
     <message>
         <source>Filename</source>
         <translation>Název souboru</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Velikost</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation>E-Mail zobrazení</translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation>Vyberte SMTP účet</translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/cz/opierec.ts b/i18n/cz/opierec.ts
index e39bd18..02a29cc 100644
--- a/i18n/cz/opierec.ts
+++ b/i18n/cz/opierec.ts
@@ -12,48 +12,36 @@
 </context>
 <context>
     <name>QtRec</name>
     <message>
         <source>OpieRecord </source>
         <translation>OpieRecord </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="obsolete">Nahrát</translation>
-    </message>
-    <message>
         <source>Delete</source>
         <translation>Smazat</translation>
     </message>
     <message>
         <source>Name</source>
         <translation>Název</translation>
     </message>
     <message>
         <source>Time</source>
         <translation>Čas</translation>
     </message>
     <message>
-        <source>Location</source>
-        <translation type="obsolete">Lokalita</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
         <source>Files</source>
         <translation>Soubory</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Vzorkovací frekvence</translation>
     </message>
     <message>
         <source>Limit Size</source>
         <translation>Omezit velikost</translation>
     </message>
     <message>
@@ -68,98 +56,68 @@
         <source>Bit Depth</source>
         <translation>Bitová hloubka</translation>
     </message>
     <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Wave komprese (menší soubory)</translation>
     </message>
     <message>
         <source>Auto Mute</source>
         <translation>Ztlumit automaticky</translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="obsolete">Stereo kanály</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>Vstup</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Výstup</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>Ztlumit</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Volume</source>
         <translation>Hlasitost</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Stop</translation>
-    </message>
-    <message>
         <source>Low Disk Space</source>
         <translation>Nedostatek místa</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Máte málo místa
 na nahrávku, nebo
 nelze rozpoznat kartu</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">sekund</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Opravdu chcete &lt;font size=+2&gt;&lt;B&gt;SMAZAT&lt;/B&gt;&lt;/font&gt;
-vybraný soubor?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Ne</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Soubor nelze odstranit.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Vyberte soubor pro přehrání</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Poznámka</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Zvukový soubor nelze otevřít.
 </translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Poslat přes infra</translation>
diff --git a/i18n/cz/osearch.ts b/i18n/cz/osearch.ts
index 39bd1a7..b81828a 100644
--- a/i18n/cz/osearch.ts
+++ b/i18n/cz/osearch.ts
@@ -37,28 +37,24 @@
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Hledat vše</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">Rozlišovat velikost</translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation>Použít hvězdičkovou konvenci</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation>Hledat:</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Sem zadejte hledaná slova</translation>
     </message>
     <message>
@@ -71,36 +67,24 @@
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Výsledky</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
-        <translation type="obsolete">zobrazit hotové úkoly</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">zobrazit minulé události</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">hledat ve schůzkách</translation>
-    </message>
-    <message>
         <source>show</source>
         <translation>zobrazit</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>upravit</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>spustit</translation>
     </message>
     <message>
@@ -115,28 +99,24 @@
         <source>Link: </source>
         <translation>Link:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Typ MIME:</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>otevřít pomocí</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">hledat obsah</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>hledání %1</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Zobrazit dokončené úkoly</translation>
     </message>
     <message>
         <source>Show past events</source>
         <translation>Zobrazit uplynolé události</translation>
     </message>
     <message>
diff --git a/i18n/cz/oxygen.ts b/i18n/cz/oxygen.ts
index 35d361b..3a83195 100644
--- a/i18n/cz/oxygen.ts
+++ b/i18n/cz/oxygen.ts
@@ -64,40 +64,28 @@
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elektrická negativita</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Poloměr atomu</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Energie ionizace</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Hustota</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Bod varu</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Teplota tání</translation>
-    </message>
-    <message>
         <source>Ionization Energy</source>
         <translation>Energie jonizace</translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation>Bod varu</translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation>Teplota tání</translation>
     </message>
 </context>
diff --git a/i18n/cz/qpe.ts b/i18n/cz/qpe.ts
index 037e900..9f8a064 100644
--- a/i18n/cz/qpe.ts
+++ b/i18n/cz/qpe.ts
@@ -364,30 +364,24 @@ tuto aplikaci.</translation>
         <source>Reboot</source>
         <translation>Přebootovat</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Restartovat Opii</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Vypnout</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="obsolete">&lt;p&gt;
-Tyto možnosti vypnutí jsou poskytovány primárně pro použití během vývoje a testování systému Opie. V normálním prostředí nejsou tyto způsoby potřeba.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Připojení synchronizace</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
diff --git a/i18n/cz/security.ts b/i18n/cz/security.ts
index a78b43e..319e6e8 100644
--- a/i18n/cz/security.ts
+++ b/i18n/cz/security.ts
@@ -66,76 +66,40 @@ Můžete vybrat pouze nakonfigurované uživatele.</translation>
         <source>Login</source>
         <translation>Přihlášení</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchronizace</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Upozornění</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Všechny uživatelovy síťové rozsahy budou ztraceny.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Storno</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation>Jakákoliv</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Žádná</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation>Důležitá poznámka</translation>
     </message>
     <message>
-        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
-        <translation type="obsolete">Pro ochranu vašeho PDA jedním, nebo více pluginy (např. jednoduché ověření PINem), musíte nainstalovat alespoň jeden &lt;em&gt;opie-multiauth-*&lt;/em&gt; balíček! Až to uděláte, budete zde schopni nakonfigurovat ochranu vašeho PDA.</translation>
-    </message>
-    <message>
         <source>Locking</source>
         <translation>Zamykání</translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation>Všechny uživatelsky nastavené síťové rozsahy budou ztraceny.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
@@ -157,44 +121,32 @@ Můžete vybrat pouze nakonfigurované uživatele.</translation>
         <source>on Opie resume</source>
         <translation>při probuzení Opie</translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation>Ověření více pluginy</translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation>Pažadavek proběhl</translation>
     </message>
     <message>
-        <source>Debug options</source>
-        <translation type="obsolete">Ladící možnosti</translation>
-    </message>
-    <message>
         <source>Don&apos;t protect this config screen</source>
         <translation>Nechránit toto konfigurační okno</translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation>Zobrazovat obrazovky s vysvětlením</translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
-        <translation type="obsolete">Umožnit překlenout ověřování</translation>
-    </message>
-    <message>
-        <source>Note: the third option implies the second one</source>
-        <translation type="obsolete">Poznámka: Třetí možnost obsahuje druhou</translation>
-    </message>
-    <message>
         <source>Options</source>
         <translation>Možnosti</translation>
     </message>
     <message>
         <source>Testing</source>
         <translation>Testování</translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation>Otestovat autentizaci nyní</translation>
     </message>
     <message>
@@ -295,35 +247,20 @@ Uvědomte si ale, že všechny zadané rozsahy budou ztraceny!</translation>
         <translation>Qtopia 1.7</translation>
     </message>
     <message>
         <source>Opie 1.0</source>
         <translation>Opie 1.0</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation>IntelliSync</translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
-    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
-    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
-    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-</source>
-        <translation type="obsolete">Vyzkoušejte synchronizační protokoly pro různá zařízení.
-    IntelliSync vypne ověření heslem, ale budete dotázáni na akceptování spojení.
-    Opie1.0 bude kompatibilní s QtopiaDesktop, MultiSync a KitchenSync.
-    Qtopia1.7 změní způsob, jak jsou data posílána klientovi a nebude pracovat se staršími klienty.</translation>
-    </message>
-    <message>
-        <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation>Vyzkoušejte synchronizační protokoly pro různá zařízení.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync vypne ověření heslem, ale budete dotázáni na akceptování spojení.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 bude kompatibilní s QtopiaDesktop, MultiSync a KitchenSync.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 změní způsob, jak jsou data posílána klientovi a nebude pracovat se staršími klienty.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></translation>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/cz/sysinfo.ts b/i18n/cz/sysinfo.ts
index fc733e0..78a195f 100644
--- a/i18n/cz/sysinfo.ts
+++ b/i18n/cz/sysinfo.ts
@@ -52,28 +52,24 @@
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klikněte sem pro provedení vybraných testů.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Vyberte model pro porovnání s vašimi výsledky.</translation>
     </message>
     <message>
         <source>error</source>
         <translation>chyba</translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="obsolete">Porovnat:</translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>Tento graf znázorňuje, kolik prostoru je momentálně využito na Compact Flash paměťové kartě.</translation>
     </message>
     <message>
diff --git a/i18n/cz/tableviewer.ts b/i18n/cz/tableviewer.ts
index 2e129de..0d019d7 100644
--- a/i18n/cz/tableviewer.ts
+++ b/i18n/cz/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Nelze vytvořit výchozí hodnotu pro typ %1, klíč nepřidán.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Nebyl nalezen platný typ</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
         <source>key</source>
         <translation>klíč</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/cz/today.ts b/i18n/cz/today.ts
index 45b9e8c..c37285d 100644
--- a/i18n/cz/today.ts
+++ b/i18n/cz/today.ts
@@ -5,28 +5,24 @@
         <source>Owned by </source>
         <translation>Vlastník</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Prosím vyplňte vizitku</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klikněte pro spuštění přidružené aplikace</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">Nejsou žádné pluginy</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>Nejsou aktivovány žádné pluginy</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Today</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Today Chyba</translation>
     </message>
     <message>
diff --git a/i18n/cz/todolist.ts b/i18n/cz/todolist.ts
index a8662d7..55b5f1f 100644
--- a/i18n/cz/todolist.ts
+++ b/i18n/cz/todolist.ts
@@ -61,159 +61,83 @@
     <message>
         <source>Todo List</source>
         <translation>Seznam úkolů</translation>
     </message>
     <message>
         <source>Task</source>
         <translation>Úkol</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Todolist</translation>
-    </message>
-    <message>
         <source>Enter Task</source>
         <translation>Zadat úkol</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Upravit úkol</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>tichý</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>hlasitý</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Nový ze šablony</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nový úkol</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Klikněte sem pro vytvoření nového úkolu.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Upravit úkol</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Klikněte sem pro změnu aktuálního úkolu.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Zobrazit úkol</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Smazat...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Klikněte sem pro odstranění aktuálního úkolu.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Smazat vše...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Smazání dokončeno</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Duplikovat</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">Odeslat</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Klikněte sem pro odeslání aktuálního úkolu jinému zařízení.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Hledat</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Zobrazit hotové úkoly</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Zobrazit jen nestihnuté úkoly</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Zobrazit konečné termíny</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Zobrazit lištu zkratek</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Možnosti</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Rychlá úprava</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Toto je seznam všech aktuálních úkolů.
 
 Seznam zobrazuje následující informace:
 1. Dokončené - Zelená značka znamená dokončený úkol. Klikněte sem pro dokončení úkolu.
 2. Priorita - grafické znázornění priority úkolu. Změnu provedete dvojklikem.
 3. Popis - Popis úkolu. Klikněte sem pro výběr úkolu.
 4. Konečný termín - zobrazuje čas dokončení úkolu. Tento sloupec můžete zobrazit nebo skrýt výběrem Možnosti -&gt;&apos;Zobrazit konečné termíny&apos; z menu nahoře.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Všechny kategorie</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Nezařazené</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Došlo místo</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Todo nemůže
 zapsat změny.
@@ -258,28 +182,24 @@ Přesto skončit?</translation>
         <source>Priority</source>
         <translation>Priorita</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Shrnutí</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Konečný termín</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">Konfigurovat šablony</translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation>Editor šablon</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Přidat</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Upravit</translation>
     </message>
     <message>
diff --git a/i18n/cz/zsafe.ts b/i18n/cz/zsafe.ts
index a49d2c4..3066ae8 100644
--- a/i18n/cz/zsafe.ts
+++ b/i18n/cz/zsafe.ts
@@ -207,54 +207,24 @@ zobrazí seznam adresářů a souborů</translation>
     <message>
         <source>Please Wait...</source>
         <translation>Prosím čekejte...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nelze vytvořit adresář
-.../Documents/application
-
-ZSafe se nyní ukončí.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nelze vytvořit adresář
-%1
-
-ZSafe se nyní ukončí.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nelze vytvořit adresář
-.../Documents/application/zsafe
-
-ZSafe se nyní ukončí.</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Nový dokument</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Otevřít dokument</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Uložit dokument jako..</translation>
     </message>
     <message>
@@ -377,40 +347,32 @@ ZSafe se nyní ukončí.</translation>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Opravdu chcete smazat?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>N&amp;emazat</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Upravit položku</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Nová položka</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Název položky musí být jiný
 než název kategorie.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Hledat</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Položka nenalezena</translation>
@@ -555,64 +517,36 @@ heslem</translation>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Čekejte</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Shromažďování ikon...</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Vytvořit nový ZSafe dokument</translation>
-    </message>
-    <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Nyní prosím zadejte
 dvakrát heslo k vašemu
 nově vytvořenému dokumentu.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Otevřít ZSafe dokument</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Uložit ZSafe dokument jako..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Správce hesel&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe verze 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">napsal Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Přeložil Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe verze 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation>&lt;P&gt;Nelze vytvořit adresář %1&lt;/P&gt;&lt;P&gt;ZSafe se nyní ukončí.&lt;/P&gt;</translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation>ZSafe: </translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation>&lt;P&gt;Nebyl definován dokument. Měli byste vytvořit nový&lt;/P&gt;</translation>
     </message>
     <message>
diff --git a/i18n/da/addressbook.ts b/i18n/da/addressbook.ts
index c90ff14..9584445 100644
--- a/i18n/da/addressbook.ts
+++ b/i18n/da/addressbook.ts
@@ -19,88 +19,24 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Ikke-arkiverede</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakter</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Kontakt</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Kort</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Ny</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Rediger</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Slet</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Find</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Start søgning</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Luk find</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Skriv mail til</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Send kontakt</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importer vCard</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Mine personlige detaljer</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Gem alle data</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Indstilling</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vis</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Korrekt fil-type?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Den valgte fil 
  slutter ikke med &quot;.vcf&quot;.
  Er du sikker på du vil åbne den?</translation>
     </message>
     <message>
@@ -120,28 +56,24 @@
 %1?</source>
         <translation>Er du sikker på du vil tilføje kontakten for %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Alle ja</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan ikke redigere data da en synkronisering er igang</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Rediger adresse</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>Rediger mine personlige detaljer</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakter - Mine personlige detaljer</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Ikke mere lager</translation>
     </message>
     <message>
@@ -157,40 +89,28 @@ og prøv igen.
 Afslut alligevel?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Ikke fundet</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Kunne ikke finde en kontakt med
 dette søge mønster!</translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation type="obsolete">Kort</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Ikke-arkiverede</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Eksporter vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Du skal vælge en kontakt!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Du skal angive et filnavn!</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1384,180 +1304,13 @@ Opie-Mail fås gratis!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Eksporter vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Mine personlige detaljer</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Arbejdstelefon</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Arbejdsfax</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Arbejdsmobil</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Standard email</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Emails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Hjemmetelefon</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Hjemmefax</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Hjemmemobil</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Kontor</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Profession</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistent</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Bestyrer</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Ægtefælle</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Køn</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Fødselsdag</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Årsdag</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Øgenavn</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Børn</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Navn titel</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Fornavn</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Mellemnavn</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Efternavn</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffiks</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Gem som</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Job titel</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Afdeling</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Firma</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Arbejds adresse</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Arbejds by</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Arbejds stat</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Arbejds postnummer</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Arbejds land</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Arbejds personsøger</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Arbejds hjemmeside</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Hjemmeadresse</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Hjemmeby</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Hjemmestat</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Hjemmepostnummer</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Hjemmeland</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Hjemme website</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Noter</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/da/advancedfm.ts b/i18n/da/advancedfm.ts
index 3be2637..0ead25e 100644
--- a/i18n/da/advancedfm.ts
+++ b/i18n/da/advancedfm.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Mappen eksisterer ikke</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Skift mappe</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Kør</translation>
     </message>
     <message>
@@ -113,164 +109,84 @@
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Vil du slette
-%1 filer?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nej</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Slet mappe?</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Kunne ikke omdøbe</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Vil du kopiere
-%1 filer?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Filen eksisterer!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-eksisterer. Overskriv?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Kunne ikke kopiere
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">til
-</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Kopier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Som</translation>
     </message>
     <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Kunne ikke flytte
-</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>Filstyring Output</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Filstyring send</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir sendt.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete"> eksisterer allerede.
-Vil du slette den?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 eksisterer. Overskriv?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Kunne ikke kopiere %1 til %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-er copyright 2002-2003 af
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-og er licenseret som GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Bogmærk mappe</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Fjern den aktuelle mappe fra bogmærker</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fejl</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">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 type="obsolete">Vil du slette %1
-og alt hvad der er i den?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">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>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/da/appearance.ts b/i18n/da/appearance.ts
index e26cb47..f391310 100644
--- a/i18n/da/appearance.ts
+++ b/i18n/da/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Redigér...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gem</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Tving stilændring for alle programmer.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Fravælg stilændring for disse programmer ( &lt;b&gt;*&lt;/b&gt; kan bruges som wildcard):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binær(e) fil(er)</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <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>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Genstart</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Vil du genstarte %1 nu?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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.
@@ -161,52 +129,24 @@ Klik her for at vælge et tilgængeligt skema.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klik her for at skifte farverne i det nuværende farveskema.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klik her for at slette det valgte farveskema i listen til venstre.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klik her for at navngive og gemme det nuværende farveskema.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Klik her for at lade alle programmer bruge de globale udseende indstillinger.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Hvis nogle programmer ikke vises korrekt med de globale udseende indstillinger kan visse features slås fra for det pågældende program.
-
-Dette område lader dig vælge et program og hvilke indstillinger to vil slå fra.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Klik her for at tilføje et program til listen ovenover.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Klik her for at slette det nuværende valgte program.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Klik her for at flytte det nuværende valgte program opad i listen.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Klik her for at flytte det nuværende valgte program nedad i listen.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klik her for at vælge en stil-art til fane-dialogvinduer (såsom dette program). De mulige stil-arter er::
 
 1. Faner - standard faner, kun med tekst mærkater
 2. Faner m. ikoner - faner med et ikon for hver fane, tekst mærkat vises kun på den valgte fane
 3. Drop-down liste - en lodret liste af faner
 4. Drop-down liste m. ikoner - en lodret liste af faner med ikoner</translation>
diff --git a/i18n/da/aqpkg.ts b/i18n/da/aqpkg.ts
index 8035889..0804fa9 100644
--- a/i18n/da/aqpkg.ts
+++ b/i18n/da/aqpkg.ts
@@ -195,44 +195,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Opretter mappe</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Link fra %1 til %1 oprettet</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">%1 fjernet</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Kunne ikke fjerne %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Fjernet</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
@@ -494,42 +474,34 @@ Er du sikker?
         <translation>Vil du fjerne eller geninstallere
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Fjern eller geninstallér</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Geninstallér</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vil du fjerne eller opgradere
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Fjern eller opgradér</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">U</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation type="unfinished">Opdaterer Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Beskrivelse&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/da/backup.ts b/i18n/da/backup.ts
index 46762e9..8b3421e 100644
--- a/i18n/da/backup.ts
+++ b/i18n/da/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Sikkerhedskopiering... arbejder...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Sikkerhedskopiering</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -26,28 +22,24 @@
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detaljer</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Backup gennemført.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Kunne ikke åbne filen %1</translation>
     </message>
     <message>
@@ -93,52 +85,44 @@
         <source>Backup And Restore</source>
         <translation>Sikkerhedskopiering</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopiering</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programmer</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Gem som</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopiering</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Gendan</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Vælg kilde</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Column 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Gendan</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Opdater fil-listen</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/da/calculator.ts b/i18n/da/calculator.ts
index 8623c4c..44c5f38 100644
--- a/i18n/da/calculator.ts
+++ b/i18n/da/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Eksperimental Lommeregner</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -123,28 +119,24 @@
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Lommeregner</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
-    <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/da/calibrate.ts b/i18n/da/calibrate.ts
index 648b788..55e7b55 100644
--- a/i18n/da/calibrate.ts
+++ b/i18n/da/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <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 type="obsolete">Velkommen til Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/da/checkbook.ts b/i18n/da/checkbook.ts
index bf3558e..04e011f 100644
--- a/i18n/da/checkbook.ts
+++ b/i18n/da/checkbook.ts
@@ -37,48 +37,24 @@
         <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 type="obsolete">Opsparinger</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Regninger</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Pengemarkedet</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Fælleskapital</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -101,32 +77,24 @@
         <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 type="obsolete">Nuværende saldo: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -185,28 +153,24 @@ For at sortere efter en kolonne, klik på kolonnens navn.</translation>
         <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 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>
@@ -646,109 +610,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Bil</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Regninger</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CD&apos;er</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Tøj</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Computer</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVD&apos;er</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Electronics</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Underholdning</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Mad</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Benzin</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Diverse</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Film</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Leje</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <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 type="obsolete">Arbejde</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Familiemedlem</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <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 type="obsolete">Elektronik</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/da/clock.ts b/i18n/da/clock.ts
index d2a773c..54623be 100644
--- a/i18n/da/clock.ts
+++ b/i18n/da/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Udsæt</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Ur</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Stopur</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Nulstil</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Indstil alarmen</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Indstil dato og tid.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarmen er tændt</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarmen er slukket</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Ur: Alarmen blev overhørt.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarmen er indstillet: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -234,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Indstil Alarmen</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Time</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minut</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">MP3 Alarm</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Udsættelse
-(minutter)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Lyd</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/da/datebook.ts b/i18n/da/datebook.ts
index f98d6d5..4ec555d 100644
--- a/i18n/da/datebook.ts
+++ b/i18n/da/datebook.ts
@@ -334,24 +334,32 @@ Afslut alligevel?</translation>
     <message>
         <source>Office</source>
         <translation>Kontor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Hjemme</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategori:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -537,28 +545,24 @@ Afslut alligevel?</translation>
     <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="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>
diff --git a/i18n/da/embeddedkonsole.ts b/i18n/da/embeddedkonsole.ts
index e64ae65..c2149ad 100644
--- a/i18n/da/embeddedkonsole.ts
+++ b/i18n/da/embeddedkonsole.ts
@@ -19,80 +19,48 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Foreslåede kommandoer&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Mikro</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Lille fast</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Medium fast</translation>
-    </message>
-    <message>
         <source>Command List</source>
         <translation>Kommando liste</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Vis kommando liste</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skjul kommando liste</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Faner i bunden</translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Faner i toppen</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Grøn på sort</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Sort på hvidt</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Hvidt på sort</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Sort på transparent</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Sort på rød</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rød på sort</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Grøn på gul</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blå på lilla</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Lilla på blå</translation>
     </message>
     <message>
@@ -111,32 +79,24 @@
         <source>Amber on Black</source>
         <translation>Orange på sort</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Tilpasset</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farver</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Skrift</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Tilvalg</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Mellemrum</translation>
     </message>
     <message>
@@ -151,28 +111,24 @@
         <source>Down</source>
         <translation>Ned</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Sæt ind</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hurtig redigering</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Rediger</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Ingen</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Venstre</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Højre</translation>
     </message>
     <message>
diff --git a/i18n/da/fifteen.ts b/i18n/da/fifteen.ts
index a540f3c..2625f1f 100644
--- a/i18n/da/fifteen.ts
+++ b/i18n/da/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Bland</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Løs</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Spil</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Femtenspillet</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/kbill.ts b/i18n/da/kbill.ts
index d402b27..5bb990d 100644
--- a/i18n/da/kbill.ts
+++ b/i18n/da/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;Historien&lt;/b&gt;&lt;p&gt;Endnu engang ligger verdenens skæbte i dine hænder! En ond hacker, kun kendt som &quot;Bill&quot;, har skabt den ultimative computervirus. En virus så magtfuld, at den kan lave en almindelig computer til en toaster. (Argh!) &quot;Bill&quot; har klonet sig selv til en million milliard micro-udgaver. Deres eneste formål er at sprede den afskyelige virus, som smart nok er forklædt som et populært operativsystem. Som systemadministrator og desinfektør er det dit arbejde, at sørge for at Bills mission mislykkes.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>Historien bag KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>KBills regler</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation type="unfinished">&lt;b&gt;Reglerne&lt;/b&gt;&lt;p&gt;kBill er omhyggeligt designet til at være lige så let at bruge for hele familien, som for lille Sally. Betatesting i årevis - næh - dagevis og eksperthjælp fra de billigste brugerfladedesignere har givet et spil der er let at bruge, men alligevel ikke minder om en Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Tæsk en Bill (klik)&lt;/LI&gt;&lt;LI&gt;Genstart en computer (klik)&lt;/LI&gt;&lt;LI&gt;Saml et stjålet OS op og flyt det tilbage (træk) til computeren&lt;/LI&gt;&lt;LI&gt;Træk spanden for at fjerne gnister&lt;/LI&gt;&lt;LI&gt;Point er baseret på den totale oppetid, med bonus for at dræbe Bill-kloner.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Resten kan du nok selv regne ud. Vi gjorde, så det skulle ikke være så svært</translation>
     </message>
     <message>
diff --git a/i18n/da/libbatteryapplet.ts b/i18n/da/libbatteryapplet.ts
index c240e44..78c6bc4 100644
--- a/i18n/da/libbatteryapplet.ts
+++ b/i18n/da/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Luk</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>Oplader</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Procent batteri tilbage</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Batteri status: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>God</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Lav</translation>
     </message>
     <message>
@@ -41,52 +33,36 @@
         <source>On backup power</source>
         <translation>På backup strøm</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Strøm on-line</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Ekstern strøm afbrudt</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Batteri tid tilbage</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Batteristatus</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Fejl</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>kunne ikke åbne fil</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Procent strøm tilbage:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Tid tilbage på batteriet:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/da/libclockapplet.ts b/i18n/da/libclockapplet.ts
index eabf574..bd02d12 100644
--- a/i18n/da/libclockapplet.ts
+++ b/i18n/da/libclockapplet.ts
@@ -1,22 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherClock</name>
     <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;System-klokken ser ikke ud til at passe.
-(%1)&lt;/p&gt;&lt;p&gt;Vil du stille den nu?&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Set time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/da/libliquid.ts b/i18n/da/libliquid.ts
index 471b37e..0a2fe89 100644
--- a/i18n/da/libliquid.ts
+++ b/i18n/da/libliquid.ts
@@ -1,21 +1,14 @@
 <!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 type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/da/libopiepim2.ts b/i18n/da/libopiepim2.ts
index bcd05b0..6088d46 100644
--- a/i18n/da/libopiepim2.ts
+++ b/i18n/da/libopiepim2.ts
@@ -1,112 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Kalender-knap</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Kontakter-knap</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Menu-knap</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Post-knap</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Home-knap</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Optag-knap</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Roter skærmbillede</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rød:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Grøn:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blå:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Vælg farve</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mere</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mere...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Navn:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Navn</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Størelse</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Stor</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Mellem</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Lille</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Gentagende begivenhed</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dag</translation>
@@ -305,243 +207,24 @@ og</translation>
         <translation type="unfinished">månede(r)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">år</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Hver</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Gentagende begivenhed</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ingen</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Uge</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Måned</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">År</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Hver:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Hyppighed</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Afslut den:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Ingen slut dato</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Gentagelse aktiv</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Man</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tir</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Ons</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fre</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Lør</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Søn</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Hver</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Ingen slut-dato</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dage</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dag</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">uger</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">uge</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">måneder</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">månede</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">år</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">år</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">og</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-og</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, og</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Ingen gentagelse</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dag(e)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Gentagelse aktiv</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Man</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tir</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Ons</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fre</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Lør</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Søn</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">uge(r)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Gentag efter</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">månede(r)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">år</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Hver</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">på</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Tid:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Vælg tid:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -595,50 +278,24 @@ og</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Åbn</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Gem</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Størrelse</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Beskrivelse:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioritet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation type="unfinished"></translation>
@@ -795,36 +452,24 @@ og</translation>
         <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>Documents</source>
-        <translation type="obsolete">Dokumenter</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Filer</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -839,32 +484,24 @@ og</translation>
         <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 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 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>
diff --git a/i18n/da/libopieui2.ts b/i18n/da/libopieui2.ts
index 3057343..9a4f3c6 100644
--- a/i18n/da/libopieui2.ts
+++ b/i18n/da/libopieui2.ts
@@ -1,346 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Kalender-knap</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Kontakter-knap</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Menu-knap</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Post-knap</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Home-knap</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Optag-knap</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Roter skærmbillede</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rød:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Grøn:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blå:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Vælg farve</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mere</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mere...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Åbn</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Gem</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Navn:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Navn</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Størelse</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Stor</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Mellem</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Lille</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over Lazy Dog</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Navn</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Gentagende begivenhed</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ingen</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Uge</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Måned</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">År</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Hver:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Hyppighed</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Afslut den:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Ingen slut dato</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Gentagelse aktiv</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Man</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tir</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Ons</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fre</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Lør</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Søn</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Hver</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Ingen slut-dato</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dage</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dag</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">uger</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">uge</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">måneder</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">månede</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">år</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">år</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">og</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-og</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, og</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Ingen gentagelse</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dag(e)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Gentagelse aktiv</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Man</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tir</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Ons</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fre</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Lør</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Søn</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">uge(r)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Gentag efter</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">månede(r)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">år</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Hver</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -469,277 +137,39 @@ og</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Navn</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Dato</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Description:</source>
-        <translation type="obsolete">Beskrivelse:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Prioritet:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Deadline:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Kategori:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Standard email:</translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Kontor:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Arbejde hjemmeside:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Arbejde tlf:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Arbejde fax:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Arbejde mobil-tlf:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Forretning pager:</translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Privat hjemmeside:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Privat telefon:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Privat fax:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Privat mobil-tlf:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Alle email-adresser:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Stilling:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistent:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Leder:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Mand</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Kvinde</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Køn:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Ægtefælle:</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Fødselsdag:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Bryllupsdag:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Børn:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notater:</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Start:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Slut:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Notat:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Hver</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 hver </translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">Den %1 hver</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Hver</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Mandag</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Tirsdag</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Onsdag</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Torsdag</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Fredag</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Lørdag</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">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 type="obsolete">Meget høj</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Høj</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normal</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Lav</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Meget lav</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Placering:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Hele dagen</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Flere dage</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <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 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 type="obsolete">Den %1 %2 på hver</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Ingen</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">.</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">.</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">.</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">.</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/da/libqpe.ts b/i18n/da/libqpe.ts
index 188e6e9..82b5c1d 100644
--- a/i18n/da/libqpe.ts
+++ b/i18n/da/libqpe.ts
@@ -186,28 +186,24 @@ redigere kategorierne.</translation>
     <message>
         <source>Find</source>
         <translation>Find</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Strengen blev ikke fundet.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Slutningen er nået. Starter fra begyndelsen</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation></translation>
     </message>
     <message>
@@ -472,30 +468,24 @@ Frigør noget hukommelse og prøv igen.</translation>
         <source>year</source>
         <translation>år</translation>
     </message>
     <message>
         <source>PM</source>
         <translation></translation>
     </message>
     <message>
         <source>AM</source>
         <translation></translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Er du sikker på du vil slette
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ikke-arkiverede</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Arbejds adresse:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -774,44 +764,24 @@ Frigør noget hukommelse og prøv igen.</translation>
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Lør</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Søn</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Klik for at lukke dette vindue uden at gemme ændringer.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Klik for at lukke dette vindue.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Klik for at lukke dette vindue og anvende ændringer.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Klik for at gøre dette vindue flytbart.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Klik for at få dette vindue til at bruge hele skærmen.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Der findes ikke nogen omfattende hjælp til dette program, men der er stadig kontekstfølsom hjælp.&lt;p&gt;Sådan bruger du kontekstfølsom hjælp:&lt;p&gt;&lt;ol&gt;&lt;li&gt;klik og hold hjælpeknappen&lt;li&gt;når vindues titlen viser &lt;b&gt;Hvad er det...&lt;/b&gt;, så klik på det du vil have hjælp med.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Hvad er det...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Vil du slette(new line)
 %1?&lt;/qt&gt;</translation>
@@ -856,28 +826,24 @@ Frigør noget hukommelse og prøv igen.</translation>
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dec</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Fejl</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/da/libtodaytodolistplugin.ts b/i18n/da/libtodaytodolistplugin.ts
index 4fb4759..deca93d 100644
--- a/i18n/da/libtodaytodolistplugin.ts
+++ b/i18n/da/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <source>tasks shown</source>
         <translation>opgaver vist</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Hvor mange tegns information omkring opgaven skal der vises</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Klip linien efter X tegn</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">opgaver vist </translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Indstil maksimum antal opgaver der skal vises</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Klip linien efter X tegn</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Hvor mange tegns information omkring opgaven skal der vises</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/da/libwlan.ts b/i18n/da/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/da/libwlan.ts
+++ b/i18n/da/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/da/minesweep.ts b/i18n/da/minesweep.ts
index 9319467..5017b1b 100644
--- a/i18n/da/minesweep.ts
+++ b/i18n/da/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Du vandt!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Du eksploderede!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Minestryger</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Begynder</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Ekspert</translation>
     </message>
     <message>
diff --git a/i18n/da/opie-eye.ts b/i18n/da/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/da/opie-eye.ts
+++ b/i18n/da/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/da/opie-login.ts b/i18n/da/opie-login.ts
index dbce466..e3d3b31 100644
--- a/i18n/da/opie-login.ts
+++ b/i18n/da/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <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 type="obsolete">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>
diff --git a/i18n/da/opiemail.ts b/i18n/da/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/da/opiemail.ts
+++ b/i18n/da/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/da/osearch.ts b/i18n/da/osearch.ts
index b35ce4d..bb6937b 100644
--- a/i18n/da/osearch.ts
+++ b/i18n/da/osearch.ts
@@ -5,28 +5,24 @@
         <source>OSearch</source>
         <translation>Søg</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Søg</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Søg i alle</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">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>
@@ -91,52 +87,36 @@
         <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 type="obsolete">vis udførte opgaver</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">vis hændelser i fortiden</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">søg i datoer</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Fil:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">søg indhold</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>søger %1</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>
diff --git a/i18n/da/oxygen.ts b/i18n/da/oxygen.ts
index fd5eb95..e2acb26 100644
--- a/i18n/da/oxygen.ts
+++ b/i18n/da/oxygen.ts
@@ -52,40 +52,28 @@
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elektronegativitet</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Atomradius</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Ioniseringsenergi</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Densitet</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Kogepunkt</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Smeltepunkt</translation>
-    </message>
-    <message>
         <source>%1 pm</source>
         <translation></translation>
     </message>
     <message>
         <source>%1 g/cm^3</source>
         <translation></translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Masse</translation>
     </message>
     <message>
diff --git a/i18n/da/patience.ts b/i18n/da/patience.ts
index 567c4ce..ed4d87d 100644
--- a/i18n/da/patience.ts
+++ b/i18n/da/patience.ts
@@ -17,68 +17,44 @@
         <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spil</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">S&amp;kifte kort-bagside</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Grib kort</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Indstillinger</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Om</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Spil</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Skift kort-bagside</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Grib kort</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Vend ét kort</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Vend tre kort</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation>S&amp;kifte kort-bagside</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Grib kort</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Skifte kort-bagside</translation>
     </message>
     <message>
diff --git a/i18n/da/qpe.ts b/i18n/da/qpe.ts
index 50e511e..768da64 100644
--- a/i18n/da/qpe.ts
+++ b/i18n/da/qpe.ts
@@ -57,98 +57,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Program Problem</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 svarer ikke.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Ønsker du at tvinge programmet til at afslutte?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Klik præcist midt på krydset
 for at kalibrere din skærm.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Velkommen til Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Dokumenter</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Ikoner</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Batteri niveauet er kritisk!
-Hold enheden slukket indtil den får strøm igen!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">Batteriet er næsten tomt.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Back-up batteriet er næsten tomt.
-Genoplad venligst back-up batteriet.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">visitkort</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Information</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
-(%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Batteristatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -196,32 +129,24 @@ Genoplad venligst back-up batteriet.</translation>
         <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>
@@ -238,107 +163,44 @@ Genoplad venligst back-up batteriet.</translation>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 filer</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Alle typer filer</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Dokument visning</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Medie indsat</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">Et &lt;b&gt;lager medie&lt;/b&gt; blev indsat. Skal det skannes for medie filer?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Hvilke medie filer</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Lyd</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Billede</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Tekst</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Video</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Link programmer</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Begræns søgning til mappe: (ikke ibrug endnu)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Tilføj</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">Dit valg vil blive gemt på mediet.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">Spørg ikke igen for dette medie</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Hvilke medie filer</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Lyd</translation>
@@ -372,31 +234,24 @@ Genoplad venligst back-up batteriet.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">Batteristatus</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -424,36 +279,24 @@ Genoplad venligst back-up batteriet.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Systemets dato ser ikke ud til at være korrekt.
 (%1)&lt;/p&gt;&lt;p&gt;Ønsker du at indstille uret?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Batteri niveauet er kritisk!
-Hold enheden slukket indtil den får strøm igen!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Back-up batteriet er næsten tomt.
-Genoplad venligst back-up batteriet.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">visitkort</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -514,81 +357,59 @@ immediately.</source>
         <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="obsolete">&lt;p&gt;
-Disse muligheder er primært givet til brug under udvikling og test af Opie systemet. I et normalt miljø er dette unødvendigt.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Fortryd</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Luk ned...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Synkroniserings-forbindelse</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Et uautoriseret system ønsker adgang til denne enhed.&lt;p&gt;Hvis du bruger en Qtopia Desktop version ælder end 1.5.1 skal du opgradere.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished">Afvis</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Et ukendt system ønsker adgang til denne enhed.&lt;p&gt;Hvis det er første gang du synkroniserer er dette normalt.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Tillad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Synkroniserer</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Kontakter&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Fortryd</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/security.ts b/i18n/da/security.ts
index 959d128..fb94793 100644
--- a/i18n/da/security.ts
+++ b/i18n/da/security.ts
@@ -157,112 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Vælg kode</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Skift kode</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Indtast kode</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Koden er forkert</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Den indtastede kode er forkert.
-Adgang nægtet</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Vilkårlig</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ingen</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Indtast ny kode</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Gentag ny kode</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Sikkerheds Indstillinger</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Skift kode</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Slet kode</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Spørg efter kode ved opstart</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Synkronisering</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Tillad synkronisering fra netværk:</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (standard)</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Vilkårlig</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ingen</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Beskyttelse med kode giver en minimal sikkerhed mod almindelig adgang til denne enhed.</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Kodeord</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Synkronisering</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Tillad synkronisering fra netværk:</translation>
diff --git a/i18n/da/snake.ts b/i18n/da/snake.ts
index b0ba044..333c6cd 100644
--- a/i18n/da/snake.ts
+++ b/i18n/da/snake.ts
@@ -13,39 +13,31 @@
         <source>SNAKE!</source>
         <translation>SNAKE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Brug piletasterne for at guide
 slangen til at æde musen. Du må ikke
 støde ind i vægge, kanter eller dens hale.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Tryk en tast for at starte</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>     Point :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER!
  Dine point: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Tryk en tast for at begynde et nyt spil.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/da/sysinfo.ts b/i18n/da/sysinfo.ts
index 89d3394..c597f6e 100644
--- a/i18n/da/sysinfo.ts
+++ b/i18n/da/sysinfo.ts
@@ -122,40 +122,24 @@
     <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 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>
@@ -187,58 +171,48 @@ Memory is categorized as follows:
         <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>
-    </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>
     <message>
@@ -288,30 +262,24 @@ Klik og hold på en proces for at se yderligere information om processen eller f
         <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>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>
@@ -361,32 +329,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Model: </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/da/tableviewer.ts b/i18n/da/tableviewer.ts
index 62b20ab..dc14c76 100644
--- a/i18n/da/tableviewer.ts
+++ b/i18n/da/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Kunne ikke lave en standard værdi for typen %1, Nøglen blev ikke tilføjet.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Ingen brugbar type fundet</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Nulstil</translation>
     </message>
     <message>
         <source>key</source>
         <translation>nøgle</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/da/tictac.ts b/i18n/da/tictac.ts
index 509682c..4c865d9 100644
--- a/i18n/da/tictac.ts
+++ b/i18n/da/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/da/today.ts b/i18n/da/today.ts
index c25f037..d908ab9 100644
--- a/i18n/da/today.ts
+++ b/i18n/da/today.ts
@@ -9,36 +9,28 @@
         <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 type="obsolete">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>
-    <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
@@ -63,83 +55,35 @@
         <source>Move Up</source>
         <translation>Flyt Op</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Flyt Ned</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Aktiv/Rækkefølge</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">Start automatisk
-ved opvågning?
-(Kun Opie)</translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Vælg denne hvis Idag skal startes automatisk ved opvågning.</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">Minutter inaktiv</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Hvor mange minutter PDA&apos;en har været i dvale før autostart egenskaben er aktiv ved opvågning</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Ikon størrelse</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Indstil størrelsen på ikonet i pixels</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Genopfrisk</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Hvor ofte Idag skal genopfriske sig selv</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete"> sek</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">aldrig</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Blandet</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>Afkryds feltet for at aktivere/deaktivere et plugin eller brug piletasterne til højre for at ændre rækkefølgen de bliver vist</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Idag konfiguration</translation>
     </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Mini-banner</translation>
-    </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Vælg denne hvis Idag skal startes automatisk ved opvågning.</translation>
     </message>
     <message>
diff --git a/i18n/da/todolist.ts b/i18n/da/todolist.ts
index 451ee80..55a63b6 100644
--- a/i18n/da/todolist.ts
+++ b/i18n/da/todolist.ts
@@ -76,206 +76,118 @@
     <message>
         <source>Edit Task</source>
         <translation>Rediger opgave</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>stille</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>høj</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Opgaveliste</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Ny fra skabelon</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Ny opgave</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Klik her for at oprette en ny opgave.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Rediger opgave</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Klik her for at redigere den valgte opgave.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Vis opgave</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Slet...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Klik her for at fjerne den valgte opgave.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Slet alle...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Slet afsluttede</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Send</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Klik her for at sende den valgte opgave til en anden enhed.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Find</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Vis afsluttede opgaver</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Vis kun forfaldne opgaver</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Vis opgave deadlines</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Vis genvejspanel</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategori</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Valgmuligheder</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Hurtig Redigering</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Dette er en liste over alle nuværende opgaver.
 
 Listen viser følgende information:
 1. Afsluttet - Et grønt hak indikerer at opgaven er afsluttet. Klik her for at afslutte en opgave.
 2. Prioritet - En grafisk repræsentation af opgavens prioritet. Dobbel-klik her for at ændre.
 3. Beskrivelse - Beskrivelse af opgaven. Klik her for at vælge opgaven.
 4. Deadline - Viser hvornår opgaven skal være afsluttet. Denne kolonne kan blive vist eller skjules ved at vælge Valgmuligheder-&gt;&apos;Vis opgave deadlines&apos; fra menuen ovenover.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Alle kategorier</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Ikke mere plads</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Opgaveliste kunne ikke
 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 type="obsolete">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 type="obsolete">Duplikere</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>A.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioritet</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Beskrivelse</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Deadline</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
@@ -503,28 +415,24 @@ Det hjælper dig med hurtigt at tilføje en ny opgave til din liste. Dette områ
         <source>Select category to organize this task with.</source>
         <translation>Vælg opgavens kategori.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Gentagende opgave</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Klik her hvis opgaven forekommer på et regelmæssigt basis. Hvis valgt, kan hyppigheden vælges på Gentagelse-fanen.</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Noter:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Indtast yderligere information angående opgaven her.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Opgaveliste</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Oversigt:</translation>
     </message>
 </context>
diff --git a/i18n/da/usermanager.ts b/i18n/da/usermanager.ts
index 40e3688..c23a01d 100644
--- a/i18n/da/usermanager.ts
+++ b/i18n/da/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>Tilføj gruppe</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Redigér gruppe</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE Brugerhåndtering</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Opie Brugerhåndtering</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Tilføj bruger</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/da/zsafe.ts b/i18n/da/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/da/zsafe.ts
+++ b/i18n/da/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/de/addressbook.ts b/i18n/de/addressbook.ts
index a52308a..b76ea97 100644
--- a/i18n/de/addressbook.ts
+++ b/i18n/de/addressbook.ts
@@ -19,76 +19,32 @@
     <message>
         <source>Unfiled</source>
         <translation>nicht zugewiesen</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakte</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Kontakt</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Ändern</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">E-Mail schreiben an</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Eintrag versenden</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">vCard importieren</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Persönliche Daten</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ansicht</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Während der Synchronisation ist das Bearbeiten nicht möglich</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Persönliche Daten ändern</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Adresse ändern</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Adressbuch - Meine persönlichen Daten</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nicht genügend Speicher</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
@@ -96,60 +52,28 @@ Quit anyway?</source>
         <translation>Sicherung fehlgeschlagen
 Bitte sorgen Sie für mehr
 Speicherplatz und versuchen
 sie es erneut.
 
 Dennoch beenden?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">nicht zugewiesen</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Suche schließen</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Daten speichern</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Nicht gefunden</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Karten</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Karte</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Suche starten</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Korrekter Dateityp ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nein</translation>
     </message>
     <message>
@@ -170,28 +94,24 @@ Wollen Sie sie trotzdem öffnen ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wollen Sie den Kontakt %1 wirklich
 hinzufügen?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Ja, alle</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">vCard exportieren</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Sie müssen einen Eintrag auswählen !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Sie müssen einen Dateinamen angeben !</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation>Kontakt bearbeiten</translation>
     </message>
 </context>
@@ -1386,180 +1306,13 @@ wird nach dem Neustart der Anwendung aktiv!</translation>
         <source>Export vCard</source>
         <translation>vCard exportieren</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Persönliche Daten</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation>Zeige Schnellsuche</translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Tel. gesch.</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax gesch.</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Handy gesch.</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Standard-EMail</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">E-Mails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Priv. Telefon</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Priv. Fax</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Priv. Handy</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Büro</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Beruf</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistent</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Manager</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Ehepartner</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Geschlecht</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Geburtstag</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Jahrestag</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Spitzname</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Kinder</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Titel</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Vorname</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Mittlerer Name</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Nachname</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffix</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Speichern unter</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Berufsbezeichnung</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Abteilung</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Firma</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Straße, gesch.</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Gesch. Stadt</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Gesch. Staat</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Gesch. PLZ</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Gesch. Land</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Gesch. Pager</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Gesch. Web</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Priv. Straße</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Priv. Stadt</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Priv. Staat</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Priv. PLZ</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Priv. Land</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Priv. Webseite</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notizen</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/de/advancedfm.ts b/i18n/de/advancedfm.ts
index a1d57c1..acfaea9 100644
--- a/i18n/de/advancedfm.ts
+++ b/i18n/de/advancedfm.ts
@@ -62,28 +62,24 @@
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Konnte nicht umbenannt werden</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Verzeichnis existiert nicht</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Kopieren als</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Dateimanager Ausgabe</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Dateimanager Senden</translation>
     </message>
     <message>
@@ -138,166 +134,80 @@
         <source>Copy </source>
         <translation>Kopieren</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Als</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>In selbes Verzeichnis kopieren</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Konnte nicht kopieren
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">nach
-</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Nicht verschiebbar
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Zu den Dokumenten hinzufügen</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Aktionen</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Alle auswählen</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Wirklich %1 Dateien löschen?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Verzeichnis löschen?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Wirklich %1 Dateien kopieren?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Datei existiert bereits!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-existiert. Überschreiben?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">existiert bereits.
-Soll wirklich gelöscht werden?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 existiert. Überschreiben?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">%1 konnte nicht zu %2 kopiert werden</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Dateimanager
-Copyright 2002-2003 von
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-unter der GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Lesezeichen-Verzeichnis</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <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 type="obsolete">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 type="obsolete">%1 und alle Inhalte wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">%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="obsolete">%1
-konnte nicht nach
-%2
-kopiert werden</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 existiert nicht&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation>&lt;p&gt;Advanced FileManager ist Copyright 2002-2003 L.J.Potter&lt;llornkcor@handhelds.org&gt; und ist lizensiert unter der GPL.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation>&lt;p&gt;Kann das aktuelle Verzeichnis nicht aus den Lesezeichen löschen. Es ist nicht als Lesezeichen abgelegt&lt;/p&gt;</translation>
     </message>
     <message>
diff --git a/i18n/de/appearance.ts b/i18n/de/appearance.ts
index 5d9d2f3..a4aa7fc 100644
--- a/i18n/de/appearance.ts
+++ b/i18n/de/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Anpassen...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Löschen</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Speichern</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Stil für alle Anwendungen erzwingen.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Stil für diese Anwendungen deaktivieren (&lt;b&gt;*&lt;/b&gt; kann als Platzhalter benutzt werden):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binäre Datei(en)</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <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>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Neustart</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Wollen Sie %1 nun neu starten?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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>
@@ -157,51 +125,24 @@ Klicken Sie hier, um ein verfügbares Farbschema auszuwählen.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Klicken Sie hier, um die Farbe der aktuellen Farbe oder des aktuellen Schemas auszuwählen.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klicken Sie hier, um um das in der linken Liste ausgewählte Farbschema zu löschen.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klicken Sie hier, um das aktuelle Farbschema zu speichern.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Klicken Sie hier, damit alle Anwendungen die globalen Erscheinungseinstellungen verwenden.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Sollten einige Anwendungen mit dem globalen Erscheinungsbild nicht korrekt angezeigt werden, können hier bestimmte Eigenschaften für diese Anwendung ausgeschaltet werden.
-Dieser Bereich erlaubt anwendungsspezifische Eigenschaften auszuschalten.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Klicken Sie hier, um eine Anwendung in obige Liste hinzuzufügen.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Klicken sie hier, um die gewählte Anwendung zu löschen.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Klicken sie hier, um die gwählte Anwendung in der Liste n ach oben zu verschieben.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Klicken sie hier, um um die gewählte Anwendung in der Liste nach unten zu verschieben.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klicken sie Hier, um de gewünschten Stil für reiterbasierte Dialoge (wie diese Anwendung) auszuwählen. Die verfügbaren Stile sind
 1. Reiter- normale Reiter mit Texttiteln
 2. Reiter m. Symb. - Reiter mit Symbolen, bei denen der Text nur im ausgewählten Reiter erscheint
 3. Aufklappliste - Eine vertkale Auswahlliste zum Aufklappen mit Text
 4. Aufklappliste m. Symbolen - Eine vertikale Auswahlliste zum Aufklappen mit Symbolen
 </translation>
diff --git a/i18n/de/aqpkg.ts b/i18n/de/aqpkg.ts
index 0ceeadc..f535f61 100644
--- a/i18n/de/aqpkg.ts
+++ b/i18n/de/aqpkg.ts
@@ -199,56 +199,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Statusdatei konnte nicht geöffnet werden- </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Temp. Statusdatei konnte nicht geöffnet werden- </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>ipkg konnte nicht gestartet werden</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Öffnen fehlgeschlagen: </translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Erstellung Verzeichnis </translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Verlinkung von %1 mit %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Verlinkung von %1 mit %2 fehlgeschlage</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">%1 gelöscht</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Löschen %1 fehlgeschlagen</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Gelöscht </translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Löschen fehlgeschlagen </translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation>Konnte ipkg-link nicht starten</translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation>Erstellen symolischer Links fehlgeschlagen!</translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation>Symbolischer Link erfolgreich erstellt.</translation>
@@ -508,42 +476,34 @@ löschen zu wollen ?</translation>
         <translation>Möchten Sie %1
 löschen oder neu installieren ?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Löschen oder Neuinstallation</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Neuinstallation</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Möchten Sie %1
 löschen oder aktualisieren ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Löschen oder Aktualisieren</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">U</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Aktualisiere Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Bechreibung&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/de/backup.ts b/i18n/de/backup.ts
index 1ee53b9..ed4ce9d 100644
--- a/i18n/de/backup.ts
+++ b/i18n/de/backup.ts
@@ -1,21 +1,17 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Sichern und Wiederherstellen... arbeitet ...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Sichern und Wiederherstellen</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Fehler vom System:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Nachricht</translation>
@@ -28,44 +24,36 @@
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Sichern und Wiederherstellen... Fehlgeschlagen!!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Sichern erfolgreich.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Bitte wählen Sie etwas zum wiederherstellen.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Wiederherstellung fehlgeschlagen.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Folgende Datei konnte nicht geöffnet werden: %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Wiederherstellung erfolgreich.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation>Sicherung erfolgreich.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Rückspielen erfolgreich.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation>Sichere...</translation>
     </message>
     <message>
@@ -99,72 +87,56 @@
         <source>Backup And Restore</source>
         <translation>Sichern und Wiederherstellen</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Sichern</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Anwendungen</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Speichern nach</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Sichern</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Wiederherstellen</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Quelle wählen</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Spalte 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Wiederherstellen</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Erneuere Dateiliste</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation>Quellen</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Hinzufügen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="obsolete">Speichern</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation>Ziel</translation>
     </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Fehler Information</translation>
     </message>
     <message>
         <source>Error Message:</source>
diff --git a/i18n/de/bartender.ts b/i18n/de/bartender.ts
index fc565fa..a85171f 100644
--- a/i18n/de/bartender.ts
+++ b/i18n/de/bartender.ts
@@ -80,36 +80,28 @@
         <source>New Drink</source>
         <translation>Neues Getränk</translation>
     </message>
     <message>
         <source>Open Drink</source>
         <translation>Öffne Getränk</translation>
     </message>
     <message>
         <source>Find by Drink Name</source>
         <translation>Suche nach Getränkenamen</translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="obsolete">Suche nach Alkohol</translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation>Bearbeiten</translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="obsolete">bearbeiten</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
@@ -127,28 +119,24 @@
 </translation>
     </message>
     <message>
         <source>Search by drink name
 </source>
         <translation>Suche nach Getränkenamen</translation>
     </message>
     <message>
         <source>Drink Name</source>
         <translation>Getränkenamen</translation>
     </message>
     <message>
-        <source>Alcohol</source>
-        <translation type="obsolete">Alkohol</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Sorry no results for
 </source>
         <translation>Keine Ergebnisse für
 </translation>
     </message>
     <message>
         <source>Find by Ingredient</source>
         <translation>Finden nach Zutaten</translation>
diff --git a/i18n/de/calculator.ts b/i18n/de/calculator.ts
index fc00f22..6059c24 100644
--- a/i18n/de/calculator.ts
+++ b/i18n/de/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Experimentaler Taschenrechner</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Taschenrechner</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/de/calibrate.ts b/i18n/de/calibrate.ts
index 210a639..05ece89 100644
--- a/i18n/de/calibrate.ts
+++ b/i18n/de/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Berühren Sie das Kreuz so präsise wie
 möglich zum Kalibrieren des Bildschirms.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Willkommen in Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/de/checkbook.ts b/i18n/de/checkbook.ts
index 1dc975d..dcbd041 100644
--- a/i18n/de/checkbook.ts
+++ b/i18n/de/checkbook.ts
@@ -30,48 +30,24 @@
         <source>Enter name of checkbook here.</source>
         <translation>Geben Sie hier den Namen des Kontos ein.</translation>
     </message>
     <message>
         <source>Type:</source>
         <translation>Typ:</translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation>Wählen Sie hier den Typ des Kontos.</translation>
     </message>
     <message>
-        <source>Savings</source>
-        <translation type="obsolete">Ersparnisse</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Rechnung</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Geldmarkt</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Rentenfond</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="obsolete">Andere</translation>
-    </message>
-    <message>
         <source>Bank:</source>
         <translation>Bank: </translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation>Geben Sie den Namen des Kontos hier ein.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Kontonummer: </translation>
     </message>
     <message>
@@ -94,32 +70,24 @@
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Geben Sie hier das Startguthaben dieses Kontos ein.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen: </translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation>Geben Sie hier zusätzliche Notizen ein.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="obsolete">Momentaner Stand: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <translation type="obsolete">Dieser Bereich zeigt den aktuellen Kontostand an.</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>Dies ist eine Liste aller Transaktionen dieses Kontos.
 Um Einträge nach einem Feld zu sortieren klicken Sie auf den Spaltennamen.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>Description</source>
@@ -173,28 +141,24 @@ Um Einträge nach einem Feld zu sortieren klicken Sie auf den Spaltennamen.</tra
         <source>Deposits by category</source>
         <translation>Einnahmen n. Kategorie</translation>
     </message>
     <message>
         <source>Draw</source>
         <translation>Zeichnen</translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation>Klicken Sie hier um den gewünschten Graphen zu erstellen.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Momentaner Stand: %1%2</translation>
-    </message>
-    <message>
         <source>Delete transaction</source>
         <translation>Transaktion löschen</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Passwortschutz</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Klicken Sie hier um den Passwortschutz für dieses Konto zu aktivieren oder zu deaktivieren.</translation>
     </message>
     <message>
@@ -639,109 +603,37 @@ The value entered should always be positive.</source>
         <translation>Geben Sie eine Gebühr ein, die mit dieser Transaktion in Verbindung steht.
 Der Wer der Gebühr sollte immer positiv sein.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notizen: </translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Geben Sie heir weitere Informationen ein.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation type="obsolete">Auto</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Rechnungen</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CDs</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Kleidung</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Computer</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVDs</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Elektronik</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Unterhaltung</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Essen</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Benzin</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Versch.</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Filme</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Miete</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="obsolete">Reise</translation>
-    </message>
-    <message>
         <source>Debit Charge</source>
         <translation>Abzahlung</translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation>Scheck</translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation>Transfer</translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation>Kreditkarte</translation>
     </message>
     <message>
-        <source>Work</source>
-        <translation type="obsolete">Arbeit</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Familienmitgiled</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">Kreditsache</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>Bankeinzug</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Bar</translation>
     </message>
-    <message>
-        <source>Electronics</source>
-        <translation type="obsolete">Elektronik</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/de/clock.ts b/i18n/de/clock.ts
index 68ec505..bb7d81a 100644
--- a/i18n/de/clock.ts
+++ b/i18n/de/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation>Min</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Schlummern</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Uhr</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Stoppuhr</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Alarm einstellen</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Stopp</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarm ist An</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarm ist Aus</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Datum und Uhrzeit setzten.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Uhr: Ein Alarm wurde verpasst.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarmzeit gesetzt: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation>Mon</translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation>Die</translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -235,54 +195,13 @@ einen ausgewählten Tag.</translation>
         <source>Countdown Alarm</source>
         <translation>Countdown Alarm</translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation>Klang spielen</translation>
     </message>
     <message>
         <source>Play File</source>
         <translation>Datei abspielen</translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Alarmzeit einstellen</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Stunde</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minute</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Schlummerdauer
-(Minuten)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">MP3-Alarm</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/de/datebook.ts b/i18n/de/datebook.ts
index 017120c..4f26e69 100644
--- a/i18n/de/datebook.ts
+++ b/i18n/de/datebook.ts
@@ -334,24 +334,32 @@ Trozdem beenden?</translation>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -407,59 +415,24 @@ Trozdem beenden?</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>
-        <comment>Friday</comment>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">So</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalender</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Wiederholung...</translation>
     </message>
     <message>
@@ -572,28 +545,24 @@ Trozdem beenden?</translation>
     <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 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>
diff --git a/i18n/de/embeddedkonsole.ts b/i18n/de/embeddedkonsole.ts
index d3ef0eb..2f1ae3e 100644
--- a/i18n/de/embeddedkonsole.ts
+++ b/i18n/de/embeddedkonsole.ts
@@ -1,83 +1,43 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Befehlsauswahl</translation>
     </message>
-    <message>
-        <source>new</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
-        <source>edit</source>
-        <translation type="obsolete">Bearbeiten</translation>
-    </message>
-    <message>
-        <source>delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>up</source>
-        <translation type="obsolete">Hoch</translation>
-    </message>
-    <message>
-        <source>down</source>
-        <translation type="obsolete">Runter</translation>
-    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Befehle</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Befehle&lt;/B&gt;</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Vorgeschlagene Befehle&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Konsole</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">winzig</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">klein, feste Breite</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">mittel, feste Breite</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">Schriftart</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Optionen</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Neu</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Eingabe</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Leertaste</translation>
     </message>
     <message>
@@ -96,52 +56,36 @@
         <source>Paste</source>
         <translation>Einfügen</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Befehlsliste anzeigen</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Befehlsliste verbergen</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Tabs unten</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Grün auf Schwarz</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Schwarz auf Weiß</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Weiß auf Schwarz</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Schwarz auf Transparent</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Schwarz auf Rot</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rot auf Schwarz</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Grün auf Gelb</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blau auf Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta auf Blau</translation>
     </message>
     <message>
@@ -160,28 +104,24 @@
         <source>Amber on Black</source>
         <translation>Bernstein auf Schwarz</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Schnelles Editieren</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editieren</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
@@ -204,28 +144,24 @@
         <source>Command List</source>
         <translation>Befehlsliste</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zeilenumbruch</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Töne benutzen</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Tabs unten</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Unten</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Oben</translation>
     </message>
     <message>
diff --git a/i18n/de/fifteen.ts b/i18n/de/fifteen.ts
index 076f51f..abaf35b 100644
--- a/i18n/de/fifteen.ts
+++ b/i18n/de/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Spalten:&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Verwirbeln</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Lösen</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Spiel</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Fünfzehn</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Konfigurieren</translation>
     </message>
 </context>
diff --git a/i18n/de/formatter.ts b/i18n/de/formatter.ts
index 20dfae3..c9f4c69 100644
--- a/i18n/de/formatter.ts
+++ b/i18n/de/formatter.ts
@@ -13,74 +13,50 @@
         <source>File Systems</source>
         <translation>Dateisysteme</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatieren</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Haupt</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">WARNUNG
-Das Ändern von Parametern
-hier kann zu Funktionsstörungen
-des Systems führen.</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>fstab bearbeiten</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Disk prüfen</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Mountpoint</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Formatieren ?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Wirklich formatieren
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">mit</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">Dateisystem ?!? Sie verlieren alle Daten !!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Formatieren nicht möglich:
 Unbekannter Typ.</translation>
@@ -117,50 +93,36 @@ Gerät ist in Benutzung.</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Kein solches Gerät vorhanden!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 wurde erfolgreich formatiert.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Versuche zu mounten.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Kartenmount fehlgeschlagen!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-wurde erfolgreich gemountet.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Sie können das Ausgabefenster nun schließen.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Intern</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Medientyp:</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Gesamt: %1 KB ( %d MB)</translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Benutzt: %1 KB ( %d MB)</translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>Verfügbar: %1 KB ( %d MB)</translation>
diff --git a/i18n/de/go.ts b/i18n/de/go.ts
index 63be37c..70a6385 100644
--- a/i18n/de/go.ts
+++ b/i18n/de/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Unentschieden.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>I passe</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Gefangene: schwarz %1, weiß %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Gehen</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/de/gutenbrowser.ts b/i18n/de/gutenbrowser.ts
index fd04410..b23724d 100644
--- a/i18n/de/gutenbrowser.ts
+++ b/i18n/de/gutenbrowser.ts
@@ -302,24 +302,32 @@ http://www.trolltech.com
     <message>
         <source>Search</source>
         <translation>Suche</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Schliessen</translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation>&lt;p&gt;Fehler beim Öffnen der Bibliothek Index. Bitte laden Sie ein neues herunter &lt;/P&gt;</translation>
     </message>
+    <message>
+        <source></source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>   </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation>FTP Download</translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation>Download beginnt in kürze</translation>
     </message>
     <message>
diff --git a/i18n/de/kbill.ts b/i18n/de/kbill.ts
index 7b60fc9..349d2ba 100644
--- a/i18n/de/kbill.ts
+++ b/i18n/de/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Datei</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Spiel anhalten</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;Die Geschichte&lt;/b&gt;&lt;p&gt;Wieder einmal liegt das Schicksal der Welt in Ihren Händen! Ein bösartiger Computerhacker, den man lediglich unter seinem Alias &quot;Bill&quot; kennt, hat den ultimativen Computervirus kreiert. Einen derart mächtigen Virus, dass dieser in der Lage ist, jedes Computersystem in einen ganz ordinären Toaster zu verwandeln (Ooooh!). &quot;Bill&quot; selbst hat sich mittlerweile in Milliarden-Millionen kleinster Microbills geklont. Ihre Absicht ist es den hinterhältigen Virus zu verbreiten, getarnt als bekanntes und verbreitetes Betriebssystem. Als Systemadministrator und Unkrautvernichter ist es Ihre Aufgabe, Bill das Handwerk zu legen und ihn von seinem schändlichen Treiben abzuhalten.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>Geschichte v. kBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Regeln v. kBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;Die Regeln&lt;/b&gt;&lt;p&gt;kBill wurde sorgfältig darauf entwickelt einfach bedienbar für die ganze Familie zu sein, so dass auch Oma Eusebia damit zurecht kommt. Jahre, nee, Tage des Betatestens and der Beratung mit den am billigsten zu habenden GUI-Designern ergaben ein Spiel, das einfach zu bedienen ist, wenn auch nicht so einfach wie ein Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Schlagen Sie die Bills (klick)&lt;/LI&gt;&lt;LI&gt;Starten Sie die Computer neu (klick) &lt;/LI&gt;&lt;LI&gt;Heben Sie die gestohlenen Betriebssysteme auf und bringen Sie sie zurück (durch Ziehen) zu den zugehörigen Computern.&lt;/LI&gt;&lt;LI&gt;Ziehen Sie den Eimer um Blitze zu löschen&lt;/LI&gt;&lt;LI&gt;Punkte sammeln basiert auf der gesamten Spielzeit und Boni für das vernichten von Bills&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Den Rest bekommen Sie sicher selbst heraus. Wir haben das auch geschafft, also kann es nicht so schwer sein</translation>
     </message>
     <message>
diff --git a/i18n/de/keypebble.ts b/i18n/de/keypebble.ts
index 3bd109e..c52e795 100644
--- a/i18n/de/keypebble.ts
+++ b/i18n/de/keypebble.ts
@@ -19,28 +19,24 @@ data, the remote host has probably dropped the
 connection.</source>
         <translation>Lesefehler: Vermutlich hat die Gegenstelle die 
 Verbindung beendet.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>Ein ungültiger Fehlercode wurde zurückgegeben</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Warten auf den Server ...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Warten auf den Desktopnamen...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Verbunden mit %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Protokollfehler: Die Nachricht %1 wurde erhalten- erwartet wurde eine update-Nachricht.</translation>
     </message>
     <message>
diff --git a/i18n/de/launchersettings.ts b/i18n/de/launchersettings.ts
index 87a575f..d7dc2b7 100644
--- a/i18n/de/launchersettings.ts
+++ b/i18n/de/launchersettings.ts
@@ -79,28 +79,24 @@
         <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="obsolete">Anzeige von Anwendungen in Unterfenstern</translation>
-    </message>
-    <message>
         <source>Show Applications in Subpopups</source>
         <translation>Anwendungen in Untermenüs anzeigen</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Beispiel 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
@@ -208,52 +204,44 @@
         <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 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 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>
diff --git a/i18n/de/libaboutapplet.ts b/i18n/de/libaboutapplet.ts
index aceef6b..1a4a466 100644
--- a/i18n/de/libaboutapplet.ts
+++ b/i18n/de/libaboutapplet.ts
@@ -3,158 +3,30 @@
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>About Shortcut</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Über</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;(new line)
-Das &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; wird entwickelt und gewartet durch das Opie team, einem weltweiten Netzwerk aus Entwicklern, die sich der freien Software verschrieben haben.(new line)
-&lt;/p&gt;(new line)
-&lt;p&gt;(new line)
-Keine Gruppe, Organisation oder Firma kontrolliert den Opie-Quellcode. Jeder ist dazu eingeladen zum Code beizutragen.(new line)
-&lt;/p&gt;(new line)
-&lt;p&gt;(new line)
-Besuchen  Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; für weitere Infos zum Opie Projekt.(new line)
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Authors</source>
-        <translation type="obsolete">Autoren</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;(new line)
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;(new line)
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;(new line)
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="obsolete">Report</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Software ist immer verbesserungsfähig, und das Opie Team ist bereit dies zu tun. Dafür müssen Sie, der Anwender, uns,d em Opie Team, sagen, was besser zu machen ist oder was nicht funktioniert wie erwartet.&lt;/p&gt;(new line)
-&lt;p&gt;Das Open Palmtop Integrated Environment benutzt ein Bug Tracking System. Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt;, um Fehler zu melden.&lt;/p&gt;(new line)
-&lt;p&gt;Wenn Sie Verbesserungsvorschläge haben, sind Sie herzlich dazu eingeladen das Bug Tracking System zu benutzen um Ihren Wunsch einzubringen. Versichern Sie sich bitte den Grad des Wunsches als &quot;Feature&quot; festzulegen.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Join</source>
-        <translation type="obsolete">Schließen  Sie sich an</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
-&lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
-&lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-Das &lt;b&gt;Open Palmtop Integrated Environment&lt;/b wurde entwickelt durch das Opie-Team, ein weltweites Netzwerk aus Softwareentwicklern die sich der freien Software verbunden fühlen.
-&lt;/p&gt;
-&lt;p&gt;
-Keine Gruppe, Firma oder Organisation kontrolliert den Opie Quellcode. Jeder ist willkommen zu Opie beizutragen.
-&lt;/p&gt;
-&lt;p&gt;Besuchen Sie &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; für weitere Informationen über Opie.
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Software ist immer verbesserungsfähig, und das Opie Team ist bereit dies zu tun. Dafür müssen Sie, der Anwender, uns,d em Opie Team, sagen, was besser zu machen ist oder was nicht funktioniert wie erwartet.&lt;/p&gt;(new line)
-&lt;p&gt;Das Open Palmtop Integrated Environment benutzt ein Bug Tracking System. Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt;, um Fehler zu melden.&lt;/p&gt;(new line)
-&lt;p&gt;Wenn Sie Verbesserungsvorschläge haben, sind Sie herzlich dazu eingeladen das Bug Tracking System zu benutzen um Ihren Wunsch einzubringen. Versichern Sie sich bitte den Grad des Wunsches als &quot;Feature&quot; festzulegen.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Sie müssen kein Hacker sein, um sich dem Opie Team anzuschließen. Sie können auch bei den nationalen Teams teilnehmen, die die Übersetzungen vornehmen. Sie können auch Themes, Bilder, Sounds und verbesserte Dokumentation beitragen. Sie entscheiden !&lt;/p&gt;(new line)
-&lt;p&gt;Besuchen Sie &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; für Informationen über einige Projekte an denen Sie teilnehmen können.&lt;/p&gt;(new line)
-&lt;p&gt;Soltlen Sie weitere Informationen benötigen wird ein Besuch unter &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; Sie mit allem notwendigen versorgen.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-</context>
-<context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>Über</translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;Das Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 Das &lt;b&gt;Open Palmtop Integrated Environment&lt;/b wurde entwickelt durch das Opie-Team, ein weltweites Netzwerk aus Softwareentwicklern die sich der freien Software verbunden fühlen.
 &lt;/p&gt;
diff --git a/i18n/de/libbatteryapplet.ts b/i18n/de/libbatteryapplet.ts
index e176679..dee14d5 100644
--- a/i18n/de/libbatteryapplet.ts
+++ b/i18n/de/libbatteryapplet.ts
@@ -10,28 +10,24 @@
         <source>could not open file</source>
         <translation>konnte Datei nicht öffnen</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Beide Akkus werden geladen</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Lade...</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Verbleibende Energie in Prozent: </translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Batteriestatus: </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Gut</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niedrig</translation>
     </message>
     <message>
@@ -50,56 +46,32 @@
         <source>On backup power</source>
         <translation>Ersatzversorgung</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Netzbetrieb</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Vom Netz getrennt</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Verbleibende Batteriezeit</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Verbleibende Energie in Prozent:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Verbleibende Batteriezeit:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Keine Zusatzbatterie angeschlossen</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Schließen</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Batteriestatus</translation>
-    </message>
-    <message>
         <source>no data</source>
         <translation>keine Daten</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">iPAQ</translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Jacket</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Restliche Energie: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Restliche Zeit: %1m %2s</translation>
     </message>
     <message>
diff --git a/i18n/de/libclockapplet.ts b/i18n/de/libclockapplet.ts
index f770ad4..b4cfc09 100644
--- a/i18n/de/libclockapplet.ts
+++ b/i18n/de/libclockapplet.ts
@@ -1,26 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherClock</name>
     <message>
-        <source>Information</source>
-        <translation type="obsolete">Informationen</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Die Systemzeit scheint ungültig zu sein.
-(%1)&lt;/p&gt;&lt;p&gt;Wollen Sie die Systemzeit ändern?&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Set time...</source>
         <translation>Zeit einstellen...</translation>
     </message>
     <message>
         <source>Clock..</source>
         <translation>Uhr..</translation>
     </message>
     <message>
         <source>Alarm...</source>
         <translation>Alarm...</translation>
     </message>
 </context>
diff --git a/i18n/de/libkppp.ts b/i18n/de/libkppp.ts
index 905cd52..365f789 100644
--- a/i18n/de/libkppp.ts
+++ b/i18n/de/libkppp.ts
@@ -1,63 +1,43 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AccountWidget</name>
     <message>
-        <source>&amp;Edit...</source>
-        <translation type="obsolete">&amp;Editieren...</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected account</source>
         <translation>Ermöglicht die Modifikation des Zugangs</translation>
     </message>
     <message>
-        <source>&amp;New...</source>
-        <translation type="obsolete">&amp;Neu...</translation>
-    </message>
-    <message>
         <source>Create a new dialup connection
 to the Internet</source>
         <translation>Erstellung einer neuen Wählverbindung
 ins Internet</translation>
     </message>
     <message>
-        <source>Co&amp;py</source>
-        <translation type="obsolete">Ko&amp;pieren</translation>
-    </message>
-    <message>
         <source>Makes a copy of the selected account. All
 settings of the selected account are copied
 to a new account, that you can modify to fit your
 needs</source>
         <translation>Erstellt eine Kopie des gewählten Zugangs. Alle
 Einstellungen des selektierten Zugangs werden in einen
 neuen Zugang kopiert, der modifiziert werden kann</translation>
     </message>
     <message>
-        <source>De&amp;lete</source>
-        <translation type="obsolete">L&amp;öschen</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Deletes the selected account
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;p&gt;Löscht den gewählten Zugang
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <source>Maximum number of accounts reached.</source>
-        <translation type="obsolete">Maximale Anzahl Zugänge erreicht.</translation>
-    </message>
-    <message>
         <source>No account selected.</source>
         <translation>Kein Zugang gewählt.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the account &quot;%1&quot;?</source>
         <translation>Sich Sie sicher den Zugang &quot;%1&quot; löschen 
 zu wollen ?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Bestätigen</translation>
@@ -109,40 +89,24 @@ zu wollen ?</translation>
     <message>
         <source>Execute Programs</source>
         <translation>Programme ausführen</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Ausführen</translation>
     </message>
     <message>
         <source>You must enter a unique account name</source>
         <translation>Sie müssen einen eindeutigen Zugangsnamen angeben</translation>
     </message>
-    <message>
-        <source>Byte</source>
-        <translation type="obsolete">Byte</translation>
-    </message>
-    <message>
-        <source>KB</source>
-        <translation type="obsolete">KB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="obsolete">GB</translation>
-    </message>
 </context>
 <context>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
         <translation>Authentisierung:</translation>
     </message>
     <message>
         <source>Script-based</source>
         <translation>Script basiert</translation>
     </message>
     <message>
@@ -358,50 +322,24 @@ some circumstances.</source>
 SND aus der &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; temporär deaktiviert
 während die Wählverbindung aufgebaut ist. Nach  
 Verbindungsende werden die Server wieder reaktiviert.
 
 Typischerweise gibt es keinen Grund diese Option
 zu verwenden, dennoch kann es unter Umständen
 sinnvoll sein.</translation>
     </message>
 </context>
 <context>
     <name>DevicesWidget</name>
     <message>
-        <source>Allows you to modify the selected account</source>
-        <translation type="obsolete">Ermöglicht die Modifikation des Zugangs</translation>
-    </message>
-    <message>
-        <source>Create a new dialup connection
-to the Internet</source>
-        <translation type="obsolete">Erstellung einer neuen Wählverbindung
-ins Internet</translation>
-    </message>
-    <message>
-        <source>Makes a copy of the selected account. All
-settings of the selected account are copied
-to a new account, that you can modify to fit your
-needs</source>
-        <translation type="obsolete">Erstellt eine Kopie des gewählten Zugangs. Alle
-Einstellungen des selektierten Zugangs werden in einen
-neuen Zugang kopiert, der modifiziert werden kann</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Deletes the selected account
-
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Löscht den gewählten Zugang
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
-    </message>
-    <message>
         <source>No devices selected.</source>
         <translation>Kein Gerät ausgewählt.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the device &quot;%1&quot;?</source>
         <translation>Sind Sie sicher, dass sie das Gerät
 &quot;%1&quot; löschen wollen?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Bestätigen</translation>
@@ -414,28 +352,24 @@ the device &quot;%1&quot;?</source>
         <source>Edit Device: </source>
         <translation>Gerät bearbeiten:</translation>
     </message>
     <message>
         <source>&amp;Device</source>
         <translation>&amp;Gerät</translation>
     </message>
     <message>
         <source>&amp;Modem</source>
         <translation>&amp;Modem</translation>
     </message>
     <message>
-        <source>You must enter a unique account name</source>
-        <translation type="obsolete">Sie müssen einen eindeutigen Zugangsnamen angeben</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected device</source>
         <translation>Ermöglicht die Modifikation des Geräts</translation>
     </message>
     <message>
         <source>Create a new device</source>
         <translation>Neues Gerät erstellen</translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
@@ -446,24 +380,28 @@ neues Gerät kopiert, das modifiziert werden kann</translation>
     <message>
         <source>&lt;p&gt;Deletes the selected device
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;p&gt;Löscht das gewählte Zugang
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Vorsichtig verwenden !!!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
         <source>You must enter a unique device name</source>
         <translation>Sie müssen einen eindeutigen Gerätnamen angeben</translation>
     </message>
+    <message>
+        <source>Error</source>
+        <translation type="unfinished">Fehler</translation>
+    </message>
 </context>
 <context>
     <name>DialWidget</name>
     <message>
         <source>Connection name:</source>
         <translation>Verbindungsname:</translation>
     </message>
     <message>
         <source>Type in a unique name for this connection</source>
         <translation>Geben Sie einene eindeutigen Namen an</translation>
     </message>
     <message>
diff --git a/i18n/de/libliquid.ts b/i18n/de/libliquid.ts
index dbf7f33..4f54445 100644
--- a/i18n/de/libliquid.ts
+++ b/i18n/de/libliquid.ts
@@ -1,76 +1,69 @@
 <!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"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Kein Durchscheinen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>getüpfelte Hintergrundfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>getüpfelte Buttonfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Durchscheinend getüpfelt, Hintergrundfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Durchscheinend getüpfelt, Buttonfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Benutzerdef. Durchscheinen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Menüfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Textfarbe</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Transparenz</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Schattierten Menütext verwenden</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Flache Werkzeugleistenbuttons</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>getüpfelter Kontrast</translation>
+        <translation type="unfinished"></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"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libmemoryapplet.ts b/i18n/de/libmemoryapplet.ts
index 0079464..2026206 100644
--- a/i18n/de/libmemoryapplet.ts
+++ b/i18n/de/libmemoryapplet.ts
@@ -114,28 +114,24 @@ Speicher wird wie folgt eingeteilt:
         <source>Manage Swapfile</source>
         <translation>Auslagerungsdatei bearbeiten</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Erzeugen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="obsolete">2 Mb,4 Mb,6 Mb,8 Mb</translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht erkannt werden.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Auslagerungsdatei deaktiviert.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Auslagerungsdatei konnte nicht erzeugt werden.</translation>
     </message>
     <message>
diff --git a/i18n/de/libopiecore2.ts b/i18n/de/libopiecore2.ts
index 09e891e..aae639d 100644
--- a/i18n/de/libopiecore2.ts
+++ b/i18n/de/libopiecore2.ts
@@ -50,28 +50,24 @@
         <source>Upper+Down</source>
         <translation>Hoch+Runter</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Hoch+Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Hoch+Links</translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Bildschirm rotieren</translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation>Actionbutton</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>OK-Button</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Ende-Button</translation>
     </message>
     <message>
diff --git a/i18n/de/libopiepim2.ts b/i18n/de/libopiepim2.ts
index 4b40f25..5dac75b 100644
--- a/i18n/de/libopiepim2.ts
+++ b/i18n/de/libopiepim2.ts
@@ -1,165 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Kalendarknopf</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Kontaktknopf</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Menüknopf</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Mailknopf</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Heimatknopf</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Aufnahmeknopf</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Bildschirm Rotierung</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Tiefgestellt+Hoch</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Tiefgestellt+Runter</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Tiefgestellt+Rechts</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Tiefgestellt+Links</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Hochgestellt +Hoch</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Hochgestellt +Runter</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Hochgestellt +Rechts</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Hochgestellt +Links</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Helligkeit:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sättigung:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Wert:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rot:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Grün:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blau:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Alphakanal:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Farbe wählen</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mehr</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mehr...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Name:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Dateityp</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Groß</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Mittel</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Klein</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Wiederholendes Ereignis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keines</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Tag</translation>
@@ -358,255 +208,24 @@ und</translation>
         <translation>Monat(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>Jahr(e)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Wiederholendes Ereignis</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Keines</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Tag</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Woche</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Monat</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jahr</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Jeden:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Häufigkeit</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Endet am:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Kein Enddatum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Wiederholung an</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Mon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Jeden</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Kein Enddatum</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">Tage</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">Tag</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">Wochen</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">Woche</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">Monate</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">Monat</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">Jahre</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">Jahr</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">und </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-und</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, and</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Keine Wiederholung</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">Tag(e)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Wiederholung an</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Mon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">Woche(n)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Wiederholen bis</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Tag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">Monat(e)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">Jahr(e)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Jeden</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">an</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Zeit:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Zeit auswählen:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation>Element</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugeordnet</translation>
@@ -660,54 +279,24 @@ und</translation>
         <translation>Konfigurieren</translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation>Hier klicken, um Ihre Einstellungen für diese Anwendung vorzunehmen.</translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation>Hier klicken um Elemente nach Kategorien zu filtern.</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Dateidialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Öffnen</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Speichern</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation>Beschreibung:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Priorität:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Fortschritt:</translation>
@@ -716,56 +305,48 @@ und</translation>
         <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>Webseite / Büro:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Telefon / Büro:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Geschäftsfax: </translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Handy / Büro: </translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Piepser / Büro: </translation>
     </message>
     <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
-    </message>
-    <message>
         <source>Home Web Page: </source>
         <translation>Webseite / Privat: </translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefon / Privat: </translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax / Privat: </translation>
     </message>
     <message>
@@ -828,28 +409,24 @@ und</translation>
         <source>Every</source>
         <translation>Jeden</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>%1 %2 jeden</translation>
     </message>
     <message>
         <source>The %1 every </source>
         <translation>Den %1 jeden</translation>
     </message>
     <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">Den %1 %1 of jeden</translation>
-    </message>
-    <message>
         <source>Every </source>
         <translation>Jeden </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Montag</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Dienstag</translation>
     </message>
     <message>
@@ -876,36 +453,24 @@ und</translation>
         <source>Start:</source>
         <translation>Start:</translation>
     </message>
     <message>
         <source>End:</source>
         <translation>Ende:</translation>
     </message>
     <message>
         <source>Note:</source>
         <translation>Notiz:</translation>
     </message>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Dokumente</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Dateien</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -920,32 +485,24 @@ und</translation>
         <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 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 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>&lt;br&gt;&lt;b&gt;Arbeitsadresse:&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Privatadresse:&lt;/b&gt;</translation>
     </message>
     <message>
diff --git a/i18n/de/libopiesecurity2.ts b/i18n/de/libopiesecurity2.ts
index 64a431f..11f93c0 100644
--- a/i18n/de/libopiesecurity2.ts
+++ b/i18n/de/libopiesecurity2.ts
@@ -1,87 +1,41 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MultiauthMainWindow</name>
-    <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="obsolete">Willkommen zum  Opie Multi-authentication Framework</translation>
-    </message>
-    <message>
-        <source>Launching authentication plugins...</source>
-        <translation type="obsolete">Starte Anmeldungsplugins...</translation>
-    </message>
-    <message>
-        <source>Proceed...</source>
-        <translation type="obsolete">Weiter...</translation>
-    </message>
-    <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="obsolete">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
-    </message>
-    <message>
-        <source>Congratulations! Your authentication has been successful.</source>
-        <translation type="obsolete">Glückwunsch! Die Anmeldung war erfolgreich.</translation>
-    </message>
-    <message>
-        <source>You have not succeeded enough authentication steps!</source>
-        <translation type="obsolete">Nicht genügend Anmeldungsschritte bestanden!</translation>
-    </message>
-</context>
-<context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="obsolete">Willkommen zum  Opie Multi-authentication Framework</translation>
-    </message>
-    <message>
         <source>Launching authentication plugins...</source>
         <translation>Starte Anmeldungsplugins...</translation>
     </message>
     <message>
         <source>Proceed...</source>
         <translation>Weiter...</translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="obsolete">Hinweis: Der &quot;exit&quot; Button sollte noch entfernt werden</translation>
-    </message>
-    <message>
         <source>Congratulations! Your authentication has been successful.</source>
         <translation>Glückwunsch! Die Anmeldung war erfolgreich.</translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
-        <translation type="obsolete">Nicht genügend Anmeldungsschritte bestanden!</translation>
-    </message>
-    <message>
         <source>Welcome to Opie</source>
         <translation>Willkommen bei Opie</translation>
     </message>
     <message>
         <source>Note: this &apos;exit&apos; button only appears during &lt;b&gt;simulations&lt;/b&gt;, like the one we are in. If you don&apos;t succeed a step, remember you can &lt;b&gt;skip&lt;/b&gt; it.</source>
         <translation>Hinweis: Dieser Abbruch Knopf erscheint nur bei einer &lt;b&gt;Simulation&lt;/b&gt;, wie in dieser in der wir uns gerade befinden. Könne Sie einen Schritt nicht vollständig beenden, so können sie ihn überspringen.</translation>
     </message>
     <message>
         <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation>Sie haben &lt;b&gt;nicht&lt;/b&gt; genügend Authentifizierungsschritte abgeschlossen!</translation>
     </message>
     <message>
         <source>Be careful: if this was not a &lt;b&gt;simulation&lt;/b&gt;, you would have to go back through all the steps now.</source>
         <translation>Vorsicht: Wenn dies keine &lt;b&gt;Simulation&lt;/b&gt; war, müssten Sie jetzt alle Schritte rückgängig machen.</translation>
     </message>
 </context>
 <context>
     <name>Opie::Security::SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
         <translation>Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
     </message>
 </context>
-<context>
-    <name>SecOwnerDlg</name>
-    <message>
-        <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
-        <translation type="obsolete">Bitte kontaktieren Sie den Besitzer oder clicken Sie auf den Bildschirm um nach Ablauf der Sperrzeit einen neuen Versuch zu starten</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/de/libopieui2.ts b/i18n/de/libopieui2.ts
index ad9af2d..f7a2202 100644
--- a/i18n/de/libopieui2.ts
+++ b/i18n/de/libopieui2.ts
@@ -1,419 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Kalendarknopf</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Kontaktknopf</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Menüknopf</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Mailknopf</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Heimatknopf</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Aufnahmeknopf</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Bildschirm Rotierung</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Tiefgestellt+Hoch</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Tiefgestellt+Runter</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Tiefgestellt+Rechts</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Tiefgestellt+Links</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Hochgestellt +Hoch</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Hochgestellt +Runter</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Hochgestellt +Rechts</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Hochgestellt +Links</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Helligkeit:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sättigung:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Wert:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rot:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Grün:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blau:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Alphakanal:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Farbe wählen</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mehr</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mehr...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Dateidialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Öffnen</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Speichern</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Name:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Dateityp</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Groß</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Mittel</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Klein</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stil</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Falsches Üben von Xylophonmusik quält jeden größeren Zwerg</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Name</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Wiederholendes Ereignis</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Keines</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Tag</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Woche</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Monat</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jahr</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Jeden:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Häufigkeit</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Endet am:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Kein Enddatum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Wiederholung an</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Mon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Jeden</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Kein Enddatum</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">Tage</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">Tag</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">Wochen</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">Woche</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">Monate</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">Monat</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">Jahre</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">Jahr</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">und </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-und</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, and</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Keine Wiederholung</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">Tag(e)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Wiederholung an</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Mon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mi</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Fr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">Woche(n)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Wiederholen bis</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Tag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">Monat(e)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">Jahr(e)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Jeden</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -542,305 +138,39 @@ und</translation>
         <translation>&lt;qt&gt;Die gewählte Taste befindet sich in der Blacklist und kann somit nicht in diesem Manager genutzt werden. Bitte nehmen sie eine andere.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Taste ist bereits vergeben</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Die gewählte Taste wurde von bereits einem anderen Element zugeordnet. Bitte versuchen sie, eine andere Taste zu nutzen.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Dateityp</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Description:</source>
-        <translation type="obsolete">Beschreibung:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Priorität:</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Fortschritt:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Fälligkeit:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Kategorie:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">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 type="obsolete">Büro: </translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Geschäftswebseiten: </translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Geschäftstelefon:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Geschäftsfax: </translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Geschäftshandy: </translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Geschäftspiepser: </translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Privatadresse:&lt;/b&gt; </translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Private Webseiten: </translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Privates Telefon: </translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Privates Fax: </translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Privates Handy: </translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Alle Emails: </translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Beruf: </translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistent: </translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Manager: </translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Mann</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Frau</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Geschlecht:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Ehepartner: </translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Geburtstag: </translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Jahrestag: </translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Kinder: </translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Spitzname: </translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notizen:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Jeden</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 jeden</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">Den %1 jeden</translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">Den %1 %1 of jeden</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Jeden </translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Montag</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Dienstag</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Mittwoch</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Donnerstag</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Freitag</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Samstag</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Sonntag</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Start:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Ende:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">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 type="obsolete">Sehr hoch</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Hoch</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normal</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Niedrig</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Sehr niedrig</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Ort:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Das ist ein Termin ohne Zeit</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">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 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 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 type="obsolete">Den %1 %2 jedes</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Keines</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation>Verzeichnisse</translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation>Alle Verzeichnisse</translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">st</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">nd</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">rd</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">th</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/de/libqpe.ts b/i18n/de/libqpe.ts
index 8576955..45cf844 100644
--- a/i18n/de/libqpe.ts
+++ b/i18n/de/libqpe.ts
@@ -186,28 +186,24 @@ die Kategorien.</translation>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Text nicht gefunden</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Ende erreicht, zurück zum Anfang</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation>Ende erreicht, start bei %1</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Suchen</translation>
     </message>
     <message>
@@ -448,61 +444,48 @@ frei und versuchen Sie es noch einmal
 </translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Setzen des Alarms nicht möglich.
 Bitte machen Sie entsprechenden Speicher 
 frei und versuchen Sie es noch einmal
 .
 </translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">T</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>J</translation>
     </message>
     <message>
         <source>day</source>
         <translation>Tag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>Monat</translation>
     </message>
     <message>
         <source>year</source>
         <translation>Jahr</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Wollen Sie %1 wirklich entfernen ?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht zugeordnet</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse gesch.&lt;/b&gt;: </translation>
     </message>
     <message>
@@ -785,44 +768,24 @@ frei und versuchen Sie es noch einmal
         <source>Fri</source>
         <translation>Fre</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sam</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Son</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu verwerfen.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Klicken Sie hier, um das Fenster zu schließen.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Klicken Sie hier, um das Fenster zu schließen und alle Änderungen zu akzeptieren.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Klicken Sie hier, um das Fenster verschiebbar zu machen.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Klicken sie hier, um das Fenster zu maximieren.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Keine allgemeine Hilfe vorhanden- bitte benutzen Sie die kontextsensitve Hilfe:&lt;p&gt;Um kontextsensitive Hilfe zu verwenden: &lt;p&gt;&lt;ol&gt;&lt;li&gt;Klicken und halten Sie den Stift auf dem Hilfeknopf.&lt;li&gt;Wenn die Titelzeile &lt;b&gt;What&apos;s this...&lt;/b&gt; anzeigt können Sie auf ein beliebiges Objekt klicken um die zugehörige Hilfe zu erhalten.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Was ist das...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Sind Sie sicher, dass sie %1 löschen wollen?&lt;/qt&gt;</translation>
     </message>
@@ -866,40 +829,24 @@ frei und versuchen Sie es noch einmal
         <source>Oct</source>
         <translation>Okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="obsolete">Konnte die Anwendung nicht finden</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="obsolete">Konnte die Anwendung nicht starten</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation>T</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation>M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/de/libtodayaddressbookplugin.ts b/i18n/de/libtodayaddressbookplugin.ts
index 6995657..24db9f0 100644
--- a/i18n/de/libtodayaddressbookplugin.ts
+++ b/i18n/de/libtodayaddressbookplugin.ts
@@ -2,44 +2,32 @@
 <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 type="obsolete">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 type="obsolete">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>
-    </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>
diff --git a/i18n/de/libtodaydatebookplugin.ts b/i18n/de/libtodaydatebookplugin.ts
index 68ab5bc..52f3007 100644
--- a/i18n/de/libtodaydatebookplugin.ts
+++ b/i18n/de/libtodaydatebookplugin.ts
@@ -7,82 +7,24 @@
         <translation>[mit Alarm]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Ganzen Tag</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Ort anzeigen</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Auswählen, um den Ort des Termins anzuzeigen</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Notizen anzeigen</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Auswählen, um die angehängte Notiz anzuzeigen</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Nur spätere
-Termine</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Auswählen, um nur spätere Termine anzuzeigen</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Wieviele Termine
-sollen
-angezeigt werden ?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Wieviele Termine maxiaml angezeigt werden. In chronologischer Reihenfolge</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Wieviele weitere Tage</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Wieviele Tage imVoraus sollen angezeigt werden</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">Tag(e)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">Nur heute</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Ort anzeigen</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Auswählen, um den Ort des Termins anzuzeigen</translation>
diff --git a/i18n/de/libtodaytodolistplugin.ts b/i18n/de/libtodaytodolistplugin.ts
index f81ce36..f7a9429 100644
--- a/i18n/de/libtodaytodolistplugin.ts
+++ b/i18n/de/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <source>tasks shown</source>
         <translation>Aufgaben gezeigt</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 die Zeile abgeschnitten werden</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Zeile abschneiden nach X Zeichen</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">Angezeigte Aufgaben</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Setzt die Zahl der maximal angezeigten Aufgaben</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Zeile abschneiden nach X Zeichen</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Nach wie vielen Zeichen soll die Zeile abgeschnitten werden</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/de/libtodayweatherplugin.ts b/i18n/de/libtodayweatherplugin.ts
index 388bf53..806755c 100644
--- a/i18n/de/libtodayweatherplugin.ts
+++ b/i18n/de/libtodayweatherplugin.ts
@@ -98,25 +98,21 @@ Druck:</translation>
         <source>SE </source>
         <translation>SO</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>km/h</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>MPH</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libvpn.ts b/i18n/de/libvpn.ts
index 4e0bd25..9708b07 100644
--- a/i18n/de/libvpn.ts
+++ b/i18n/de/libvpn.ts
@@ -17,25 +17,21 @@
     <message>
         <source>Start automatically</source>
         <translation>Automatisch starten</translation>
     </message>
     <message>
         <source>Confirm before start</source>
         <translation>Start bestätigen</translation>
     </message>
 </context>
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
-        <translation type="obsolete">VPN Verbindung</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
         <translation>&lt;p&gt;VPN konfigurieren.&lt;/p&gt;&lt;p&gt;Definiert Secure Tunnels über eine unsichere Verbindung&lt;/p&gt;</translation>
     </message>
     <message>
         <source>VPN connection</source>
         <translation>VPN Verbindung</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/libwlan.ts b/i18n/de/libwlan.ts
index 61df3ef..360be8a 100644
--- a/i18n/de/libwlan.ts
+++ b/i18n/de/libwlan.ts
@@ -1,310 +1,149 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation>&lt;UseHostName&gt;</translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">Wireless Configuration</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Allgemein</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation type="obsolete">Modus</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation type="obsolete">ESS-ID</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
+        <translation type="unfinished">Allgemein</translation>
     </message>
     <message>
-        <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">&amp;Accesspoint</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Channel</source>
-        <translation type="obsolete">&amp;Channel</translation>
+        <source>any</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
-        <translation type="obsolete">alles</translation>
+        <source>SSID</source>
+        <translation type="unfinished">SSID</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation type="obsolete">Infrastruktur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation type="obsolete">Auto</translation>
+        <translation type="unfinished">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation type="obsolete">Managed</translation>
+        <translation type="unfinished">Verwaltet</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation type="obsolete">Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation type="obsolete">Verschlüsselung</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">&amp;Verschlüsselung</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation type="obsolete">&amp;Schlüssel</translation>
+        <translation type="unfinished">Ad-Hoc</translation>
     </message>
     <message>
-        <source>Key &amp;1</source>
-        <translation type="obsolete">Schlüssel &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation type="obsolete">Schlüssel &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="obsolete">Schlüssel &amp;3</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation type="obsolete">Schlüssel &amp;4</translation>
-    </message>
-    <message>
-        <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Unverschlüsselte Pakete</translation>
+        <source>Mode</source>
+        <translation type="unfinished">Modus</translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Akzeptieren</translation>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
-        <translation type="obsolete">&amp;ZTurückweisen</translation>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
     </message>
     <message>
-        <source>SSID</source>
-        <translation type="obsolete">SSID</translation>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation type="obsolete">Umgebung neu scannen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation type="obsolete">Chn</translation>
-    </message>
-</context>
-<context>
-    <name>WLanGUI</name>
-    <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation>Verwaltet</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation>Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation>Modus</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation>ESS-ID</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="unfinished">Chn</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Verschlüsselung</translation>
+        <translation type="unfinished">Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Verschlüsselung</translation>
+        <translation type="unfinished">&amp;Verschlüsselung</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Schlüssel</translation>
+        <translation type="unfinished">&amp;Schlüssel</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Schlüssel &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation>Schlüssel &amp;4</translation>
+        <translation type="unfinished">Schlüssel &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Schlüssel &amp;2</translation>
+        <translation type="unfinished">Schlüssel &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Schlüssel &amp;3</translation>
-    </message>
-    <message>
-        <source>AP</source>
-        <translation>AP</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation>Rate</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Kanal</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation>Station</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation>ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation>Störung</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation>Qualität</translation>
+        <translation type="unfinished">Schlüssel &amp;3</translation>
     </message>
     <message>
-        <source>Signal</source>
-        <translation>Signal</translation>
-    </message>
-    <message>
-        <source>SSID</source>
-        <translation>SSID</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation>Chn</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation>&lt;UseHostName&gt;</translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation>Acces Point angeben</translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation>Scan</translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation>Akzeptiere unverschlüsselte Pakete</translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation>Status</translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation>Freq</translation>
-    </message>
-    <message>
-        <source>Link Quality</source>
-        <translation>Verbindungsqualität</translation>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Schlüssel &amp;4</translation>
     </message>
     <message>
-        <source>Live feed </source>
-        <translation></translation>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
-        <translation>WLan Gerät</translation>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Konrigurieren Sie Wi/Fi oder WLan Netzwerkkarten.&lt;/p&gt;&lt;p&gt;Definieren Sie Wireless Optionen für diese Karten&lt;/p&gt;</translation>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Schnittstelleninformation</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished">Kanal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Modus</translation>
+        <translation type="unfinished">Modus</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Station</translation>
+        <translation type="unfinished">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">AP</translation>
+        <translation type="unfinished">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Rate</translation>
+        <translation type="unfinished">Rate</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Qualität</translation>
+        <translation type="unfinished">Qualität</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Störung</translation>
+        <translation type="unfinished">Störung</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Signal</translation>
+        <translation type="unfinished">Signal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/mindbreaker.ts b/i18n/de/mindbreaker.ts
index a1d80d0..ecc0cb3 100644
--- a/i18n/de/mindbreaker.ts
+++ b/i18n/de/mindbreaker.ts
@@ -9,28 +9,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>Gewinndurchschn.: % Runden (%2 Spiele)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation>Mind Breaker</translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Antwort%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Statistiken löschen</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Sollen die Statistiken
 gelöscht werden?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
diff --git a/i18n/de/minesweep.ts b/i18n/de/minesweep.ts
index 369b30c..dd9279e 100644
--- a/i18n/de/minesweep.ts
+++ b/i18n/de/minesweep.ts
@@ -2,28 +2,24 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Gewonnen!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Explodiert!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Minenjagd</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Anfänger</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Fortgeschritten</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Experte</translation>
     </message>
     <message>
diff --git a/i18n/de/mobilemsg.ts b/i18n/de/mobilemsg.ts
index 91af9e9..16aeaf3 100644
--- a/i18n/de/mobilemsg.ts
+++ b/i18n/de/mobilemsg.ts
@@ -1,84 +1,45 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <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 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 type="obsolete">SMS: %1</translation>
-    </message>
-    <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
-        <source>Country:</source>
-        <translation type="obsolete">Land:</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="obsolete">Logo</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="obsolete">Gruppe</translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="obsolete">Bild</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="obsolete">Nachricht:</translation>
-    </message>
-    <message>
         <source>EMS</source>
         <translation>EMS</translation>
     </message>
     <message>
-        <source>Tab</source>
-        <translation type="obsolete">Tab</translation>
-    </message>
-    <message>
         <source>SMS</source>
         <translation></translation>
     </message>
     <message>
         <source>Messages: %1</source>
         <translation>Nachrichten: %1</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Nachricht</translation>
     </message>
     <message>
diff --git a/i18n/de/opie-console.ts b/i18n/de/opie-console.ts
index f932d7e..25adc75 100644
--- a/i18n/de/opie-console.ts
+++ b/i18n/de/opie-console.ts
@@ -789,28 +789,24 @@ Der Unicode Wert der Taste</translation>
         <source>SynchronizedFile</source>
         <translation>SynchronisierteDatei</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Wähle Nummer: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fehlschlag</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Nummer wählen fehlgeschlagen.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Breche ab...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Suche Modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Initialisierung...</translation>
     </message>
     <message>
@@ -855,40 +851,24 @@ Der Unicode Wert der Taste</translation>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Terminal Typ</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Farbschema</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Schriftgröße</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">klein</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">mittel</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">groß</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Zeilenumbruchskonvertierung</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Eingang</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Ausgang</translation>
     </message>
     <message>
diff --git a/i18n/de/opie-eye.ts b/i18n/de/opie-eye.ts
index 0df5a28..6ad7dc0 100644
--- a/i18n/de/opie-eye.ts
+++ b/i18n/de/opie-eye.ts
@@ -51,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation>Gehe zu vorhergehendem Bild</translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation>Schalte Vollbildanzeige um</translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation>Schalte Vorschau um</translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation>Betrachte als</translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation>Sende aktuelle Auswahl</translation>
     </message>
     <message>
@@ -205,24 +213,32 @@
     <message>
         <source>Listview mode</source>
         <translation>Listenmodus</translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation>Zeige keine getrennten Fenster</translation>
     </message>
     <message>
         <source>Display brightness...</source>
         <translation>Anzeigehelligkeit...</translation>
     </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation>%1 - O Ansicht
 
 Verzeichnisname</translation>
     </message>
     <message>
         <source>Show all files</source>
diff --git a/i18n/de/opie-login.ts b/i18n/de/opie-login.ts
index 846c152..d90d5eb 100644
--- a/i18n/de/opie-login.ts
+++ b/i18n/de/opie-login.ts
@@ -1,27 +1,23 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 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 type="obsolete">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>
@@ -43,74 +39,52 @@ kalibrieren.</translation>
 </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 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="obsolete">&lt;center&gt;Willkommen zu OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
-    </message>
 </context>
 <context>
     <name>PasswordDialog</name>
     <message>
         <source>Set Password</source>
         <comment>Caption of the password dialog</comment>
         <translation>Passwort setzen</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h2&gt;Bitte ein Passwort für den Administrator setzen.&lt;/h2&gt;&lt;/qt&gt;</translation>
     </message>
diff --git a/i18n/de/opieirc.ts b/i18n/de/opieirc.ts
index ce9ab74..e8a0852 100644
--- a/i18n/de/opieirc.ts
+++ b/i18n/de/opieirc.ts
@@ -66,28 +66,24 @@
         <source>Talking on channel</source>
         <translation>Spreche auf Kanal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Kanal Diskussion</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Geben Sie Ihre Nachricht hier ein, um an der Kanaldiskussion teizunehmen</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Abfrage</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
@@ -155,48 +151,40 @@
         <source>Channel for part not found - desynchronized?</source>
         <translation>Zu verlassenden Kanal nicht gefunden - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Kanalnachricht mit unbekanntem Absender</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>PRIVMSG von unbekanntem Typ erhalten</translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Spitznamen Änderung einer unbekannten Person</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Unbekannte Person gegangen - unsynchronisiert?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>Thema geändert auf</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Unbekanntes Kanalthema - unsynchronisiert?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>CTCP PING erhalten von </translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">CTCP VERSION erhalten von </translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION mit unbekannter Person - unsynchronisiert?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION mit unbekanntem Kanal - unsynchronisiert?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION mit schlechtem Empfänger</translation>
     </message>
     <message>
@@ -275,32 +263,24 @@
         <source>You left channel %1</source>
         <translation>Du hast Kanal %1 verlassen</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 verließ Kanal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Kanalnachricht mit unbekanntem Kanal %1</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">Du bis nun als %1 bekannt</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 ist nun bekannt als %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 beendete (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation>Server %1 version %2 unterstützt Usermodes &apos;%3&apos; und Channelmodes &apos;%4&apos;</translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation>Es sind %1 Operators online</translation>
     </message>
     <message>
@@ -491,36 +471,28 @@ Name: %4</translation>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Profilname benötigt</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Hostname benötigt</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">Port benötigt</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>Spitzname benötigt</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">Echter Name benötigt</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>Die Kanalliste muss eine Komma-
 separierte Liste von Kanalnamen
 enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -553,28 +525,24 @@ enthalten, die mit &apos;#&apos; oder &apos;+&apos; anfangen</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Das aktuell gewählte Serverprofil bearbeiten</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Neues Serverprofil hinzufügen</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Verbindung mit</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Server Nachrichten</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Kommandos hier eingeben. Eine Liste verfügbarer Kommandos findet man in der OpieIRC Hilfe</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation>Verbinde mit</translation>
     </message>
 </context>
diff --git a/i18n/de/opiemail.ts b/i18n/de/opiemail.ts
index eb9ed76..c76aea9 100644
--- a/i18n/de/opiemail.ts
+++ b/i18n/de/opiemail.ts
@@ -1,30 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="obsolete">Antwort</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="obsolete">Antwort an alle</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-</context>
-<context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Fehler beim Erstellen des Ordners</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Fehler während des Erstellens&lt;br&gt;des neuen Ordners - breche ab.&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
@@ -174,59 +159,24 @@
         <translation>Anhang</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Lösche Datei</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Füge Datei hinzu</translation>
     </message>
 </context>
 <context>
-    <name>Composer</name>
-    <message>
-        <source>CC</source>
-        <translation type="obsolete">CC</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">Betreff</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Abbrechen</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">Zurücksetzen</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="obsolete">Warteschlange</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="obsolete">Senden</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="obsolete">Von:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="obsolete">An:</translation>
-    </message>
-</context>
-<context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Frage</translation>
@@ -322,51 +272,24 @@
         <translation>Präfix</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation>ssh $SERVER exec</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation>Benutze sichere Verbindungen:</translation>
     </message>
 </context>
 <context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ansicht</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="obsolete">Neue Mail</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="obsolete">Post</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="obsolete">Postfächer</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="obsolete">OpieMail anpassen</translation>
-    </message>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Post</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Erstelle neue Post</translation>
@@ -615,248 +538,24 @@ verwendet.</translation>
         <translation>Erstellen Sie zuerst ein SMTP-Konto</translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation>Lese dieses Posting</translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation>Bearbeite diese Nachricht</translation>
     </message>
 </context>
 <context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="obsolete">OpieMail Einstellungen</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="obsolete">Ordner</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="obsolete">&amp;Hinzufügen</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="obsolete">&amp;Bearbeiten</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="obsolete">Ordnername</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="obsolete">Identität</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="obsolete">Versandart</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="obsolete">Posteingang</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="obsolete">Ordner</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="obsolete">Benutzer</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="obsolete">Server</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protokoll</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="obsolete">Postausgang</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="obsolete">Mailbox löschen</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="obsolete">Soll die Mailbox gelöscht werden?
-Alle Mails werden entfernt.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="obsolete">OpieMail Ordnereinstellungen</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">Beschreibung:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Name:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="obsolete">OpieMail Identitätseinstellungen</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="obsolete">Signatur:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="obsolete">Identität:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Name:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="obsolete">Organisation:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="obsolete">E-Mail:</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="obsolete">Antwort-Adresse</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="obsolete">Zum Senden benutzen</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="obsolete">OpieMail Posteingang</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Name:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">Server:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protokoll</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="obsolete">Zielordner</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">Benutzername:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">Port</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="obsolete">110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="obsolete">Regelmäßig überprüfen.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="obsolete">Nach Mail sehen alle:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="obsolete">Minuten</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="obsolete">&amp;Lokal gelöschte Mails vom Server entfernen.</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="obsolete">&amp;Mails auf dem Server lassen</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="obsolete">OpieMail Postausgang</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Name:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protokoll</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">Server:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">Benutzername:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="obsolete">Server verlangt Authorisierung</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">Port</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="obsolete">25</translation>
-    </message>
-</context>
-<context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation>Konfiguriere POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Name des Kontos</translation>
@@ -890,55 +589,24 @@ Alle Mails werden entfernt.</translation>
         <translation>Frage vor dem Laden großer Nachrichten</translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation>Größe von großen Nachrichten (kb):</translation>
     </message>
     <message>
         <source> kB</source>
         <translation></translation>
     </message>
 </context>
 <context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">Betreff</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="obsolete">An</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="obsolete">Absender</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="obsolete">Bearbeiten</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="obsolete">Kopieren nach</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="obsolete">Verschieben nach</translation>
-    </message>
-</context>
-<context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Konfiguriere SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation>Benutze Login</translation>
@@ -1050,38 +718,24 @@ Alle Mails werden entfernt.</translation>
         <translation>Spiele Ton wenn neue Nachrichten eintreffen</translation>
     </message>
     <message>
         <source>Click opens mail</source>
         <translation>Klick öffnet Nachricht</translation>
     </message>
     <message>
         <source>Click activate server/folder</source>
         <translation>Klick aktiviert Server/Ordner</translation>
     </message>
 </context>
 <context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">Formular1</translation>
-    </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">Formular1</translation>
-    </message>
-</context>
-<context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Zeige Text</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Sichere Anhang</translation>
     </message>
     <message>
         <source>From</source>
         <translation>Von</translation>
diff --git a/i18n/de/opierec.ts b/i18n/de/opierec.ts
index 1cd3132..477a759 100644
--- a/i18n/de/opierec.ts
+++ b/i18n/de/opierec.ts
@@ -29,72 +29,40 @@
         <source>Time</source>
         <translation>Zeit</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Dateien</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Sampling Rate</translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">44100</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">32000</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">22050</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">16000</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">11025</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">8000</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>Größe begrenzen</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Unbegrenzt</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Datei Verzeichnis</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Bit Tiefe</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">16</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">8</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>Hinein</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Hinaus</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
@@ -105,58 +73,36 @@
         <source>Low Disk Space</source>
         <translation>Geringer Plattenplatz</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Aufnahmeplatz wird 
 knapp oder eine Karte 
 wurde nicht erkannt</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">Sekunden</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Wollen Sie wirklich die ausgewählte
-Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Nein</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Konnte Datei nicht löschen.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Bitte zu spielende Datei auswählen</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Notiz</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Konnte Tondatei nicht öffnen.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Apspielen</translation>
@@ -173,60 +119,36 @@ Datei &lt;font size=+2&gt;&lt;B&gt;LÖSCHEN&lt;/B&gt;&lt;/font&gt;?</translation
         <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 type="obsolete">Aufn</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Ort</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Wave Komprimierung (kleinere Dateien)</translation>
     </message>
     <message>
-        <source>auto Mute</source>
-        <translation type="obsolete">auto still</translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>still</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Stopp</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation></translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="obsolete">Stereo Kanäle</translation>
-    </message>
-    <message>
         <source>Del</source>
         <translation></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation></translation>
     </message>
     <message>
         <source>Please select file to play</source>
         <translation>Datei zum Abpielen wählen</translation>
     </message>
 </context>
diff --git a/i18n/de/osearch.ts b/i18n/de/osearch.ts
index 7c97a70..91ed665 100644
--- a/i18n/de/osearch.ts
+++ b/i18n/de/osearch.ts
@@ -1,53 +1,29 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>Opie Suche</translation>
     </message>
     <message>
-        <source>adressbook</source>
-        <translation type="obsolete">Adressbuch</translation>
-    </message>
-    <message>
-        <source>todo</source>
-        <translation type="obsolete">Aufgaben</translation>
-    </message>
-    <message>
-        <source>datebook</source>
-        <translation type="obsolete">Terminplaner</translation>
-    </message>
-    <message>
-        <source>applications</source>
-        <translation type="obsolete">Programme</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="obsolete">Dokumente</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Überall suchen</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">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>
@@ -108,52 +84,36 @@
         <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 type="obsolete">Zeige auch erledigte Aufgaben</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">Zeige auch vergangene Termine</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">Suche in Zeitfeldern</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Datei:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Link:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Dateityp:</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">Suchinhalt</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>suche %1</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Erledigte Aufgaben anzeigen</translation>
     </message>
     <message>
         <source>Show past events</source>
         <translation>Vergangene Ereignisse anzeigen</translation>
     </message>
     <message>
diff --git a/i18n/de/oxygen.ts b/i18n/de/oxygen.ts
index b58adaa..4aac249 100644
--- a/i18n/de/oxygen.ts
+++ b/i18n/de/oxygen.ts
@@ -41,40 +41,28 @@
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elektronegativität</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Atomradius</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Ionsationsenergie</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Dichte</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Siedepunkt</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Schmelzpunkt</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
diff --git a/i18n/de/patience.ts b/i18n/de/patience.ts
index 062a9ee..c13101a 100644
--- a/i18n/de/patience.ts
+++ b/i18n/de/patience.ts
@@ -17,68 +17,44 @@
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spiel</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Kartenrücken wechseln</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Zur Position springen</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Spiel</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Kartenrücken wechseln</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Zur Position springen</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Eine Karte drehen</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Drei Karten drehen</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation>&amp;Rückseiten ändern</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Zu Position springen</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Rückseiten ändern</translation>
     </message>
     <message>
diff --git a/i18n/de/qpe.ts b/i18n/de/qpe.ts
index 7ac169d..47316e0 100644
--- a/i18n/de/qpe.ts
+++ b/i18n/de/qpe.ts
@@ -65,28 +65,24 @@
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Clicken Sie das Fadenkreuz genau 
 mittig um das Display zu kalibrieren.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Willkommen zu Opie</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Batteriestatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Geringe Batteriestärke</translation>
     </message>
 </context>
@@ -104,28 +100,24 @@ mittig um das Display zu kalibrieren.</translation>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Berühren Sie den Bildschirm irgendwo, um weiter zu machen.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Bitte warten, lade %1 Einstellungen.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Bitte warten...</translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation type="obsolete">ErstBenutzungsHintergrund</translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation>Fertig</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
@@ -288,41 +280,24 @@ mittig um das Display zu kalibrieren.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Das Systemdatum scheint nicht gültig zu sein.
 (%1)&lt;/p&gt;&lt;p&gt;Möchten Sie es anpassen?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Der Batteriestatus ist kritisch!
-Schließen Sie das Gerät schnellst 
-möglich an die Stromversorgung an!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="obsolete">Batterie nahezu erschöpft.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Die Ersatzbatterie ist schwach.
-Bitte laden Sie sie auf.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation>Visitenkarte</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Sicherer  Modus</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Es trat ein Fehler beim Systemstart ein, das System ist nun im sicheren Modus. Plugins wurden nicht geladen. Sie können die kritischen Plugins im Plugin Manager ausschalten.</translation>
     </message>
     <message>
@@ -389,49 +364,39 @@ Bitte laden Sie sie auf</translation>
         <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 type="obsolete">&lt;p&gt;
-Die Optionen zum Herunterfahren sind ausschließlich zur Entwicklung und für Tests des Opie-Systems gedacht. Unter normalen Bedingungen sind sie nicht notwendig.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Herunterfahren...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Synchronisationsverbindung</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Ein nicht authorisiertes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie eine Version von Qtopia Desktop verwenden die älter ist als 1.5.1 sollten Sie ein Upgrade in Betracht ziehen.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation>Verweigern</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Ein nicht erkanntes System fordert eine Verbindung zu diesem Gerät an.&lt;p&gt;Wenn Sie gerade eben zum ersten Mal eine Synchronisation gestartet haben, ist diese Meldung normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Erlauben</translation>
     </message>
     <message>
diff --git a/i18n/de/security.ts b/i18n/de/security.ts
index d494b69..4bfc64a 100644
--- a/i18n/de/security.ts
+++ b/i18n/de/security.ts
@@ -63,72 +63,40 @@ Login einzustellen.</translation>
         <source>Login</source>
         <translation>Login</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Achtung</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Alle manuell erstellten Werte gehen verloren.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Keine</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation>Wichtiger Hinweis</translation>
     </message>
     <message>
-        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
-        <translation type="obsolete">Es muss mindestens ein &lt;em&gt;opie-mutliauth-*&lt;/em Paket installiert sein um den PDA schützen zu können.</translation>
-    </message>
-    <message>
         <source>Locking</source>
         <translation>Sperre</translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation>Alle Benutzerdefinierten Netzbereiche gehen verloren.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation></translation>
     </message>
     <message>
@@ -150,44 +118,32 @@ Login einzustellen.</translation>
         <source>on Opie resume</source>
         <translation>Bei Resume</translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation>Mehrfache Plugin Authentifikation</translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation>Nötige Erfolge</translation>
     </message>
     <message>
-        <source>Debug options</source>
-        <translation type="obsolete">Debug Optionen</translation>
-    </message>
-    <message>
         <source>Don&apos;t protect this config screen</source>
         <translation>Diesen Dialog nicht schützen</translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation>Beschreibungen anzeigen</translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
-        <translation type="obsolete">Umgehen der Anmeldung erlauben</translation>
-    </message>
-    <message>
-        <source>Note: the third option implies the second one</source>
-        <translation type="obsolete">Hinweis: Die dritte Option erfordert die zweite Option</translation>
-    </message>
-    <message>
         <source>Options</source>
         <translation>Optionen</translation>
     </message>
     <message>
         <source>Testing</source>
         <translation>Teste</translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation>Anmeldung jetzt testen</translation>
     </message>
     <message>
@@ -203,166 +159,24 @@ Login einzustellen.</translation>
         <translation>Wenn Sie mit dem Testergebnis nicht zufrieden sind, vergessen Sie bitte nicht Ihre Einstellunge zu überprüfen.!</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
         <source>OK</source>
         <translation></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Passwort einstellen</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Passwort ändern</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Passwort falsch</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Das eingegebene Passwort ist falsch. Zugriff verwehrt</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Keine</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Neues Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Passwort erneut eingeben</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Sicherheitseinstellungen</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Passwort ändern</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Passwort löschen</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Passwort muss beim Starten 
-eingegeben werden</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Synchroniseren</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Synchronisierung gestatten aus dem Netzwerk:</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Keine</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Das Passwort bietet einen minimalen Schutz, 
-sollte jemand unerwünscht Zugriff auf dieses 
-Gerät erhalten.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (Standard)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Login</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">Automatisch einloggen</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Synchroniseren</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Synchronisierung gestatten aus dem Netzwerk:</translation>
@@ -423,19 +237,17 @@ geänderten Daten gehen dabei verloren!</translation>
         <source>Opie 1.0</source>
         <translation></translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation></translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation>IntelliSync akzeptiert jedes Passwort aber die Verbindung muss immer bestätigt werden.
-Opie1.0 ist kompatibel it QtopiaDesktop, MultiSync und KitchenSync
-QTopia1.7 verwendet eine eigene Datenübertragung und funktioniert nicht mit älteren Programmen.</translation>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/showimg.ts b/i18n/de/showimg.ts
index ef81eb2..dbb3881 100644
--- a/i18n/de/showimg.ts
+++ b/i18n/de/showimg.ts
@@ -140,47 +140,24 @@
         <translation>Größe</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Farben</translation>
     </message>
     <message>
         <source>Alpha</source>
         <translation>Alpha</translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Größe</translation>
-    </message>
-    <message>
-        <source>Colors</source>
-        <translation type="obsolete">Farben</translation>
-    </message>
-    <message>
-        <source>Alpha</source>
-        <translation type="obsolete">Alpha</translation>
-    </message>
-    <message>
-        <source>File Name</source>
-        <translation type="obsolete">Dateiname</translation>
-    </message>
-    <message>
-        <source>File Size</source>
-        <translation type="obsolete">Dateigröße</translation>
-    </message>
-</context>
-<context>
     <name>SettingsDialogBase</name>
     <message>
         <source>Preferences</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Slide Show</source>
         <translation>Slideshow</translation>
     </message>
     <message>
         <source>Delay between pictures</source>
         <translation>Verzögerung zwischen Bildern</translation>
diff --git a/i18n/de/snake.ts b/i18n/de/snake.ts
index 133e087..74490c1 100644
--- a/i18n/de/snake.ts
+++ b/i18n/de/snake.ts
@@ -14,40 +14,31 @@
         <translation>SCHLANGE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Benutzen Sie die Wippe, um die
 Schlage zu steuern und die Mäuse
 zu fressen. Sie dürfen dabei weder die
 Wände noch Ihren Schwanz berühren.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Drücken Sie eine Taste, um zu starten</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>Punkte: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>Erwischt! 
 Ihre Punktezahl: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Drücken Sie eine Taste, um ein neues
-Spiel zu beginnen.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Drücken Sie zum Starten eine Taste</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Für eine neues Spiel drücken Sie eine Taste.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/de/sysinfo.ts b/i18n/de/sysinfo.ts
index d6fe059..67d8e67 100644
--- a/i18n/de/sysinfo.ts
+++ b/i18n/de/sysinfo.ts
@@ -144,39 +144,24 @@ Mit den Auswahlboxen kann man die gewünschten Tests einstellen.</translation>
         <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 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>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.
@@ -193,65 +178,52 @@ Speicher wird wie folgt unterteilt:
         <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>
-    <message>
         <source>Used by</source>
         <translation>Benutzt von</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">Sie wollen wirklich %1 für dieses Modul ausführen?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Wirklich %1 für dieses Modul
 ausführen?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Genutzt (%1 kB)</translation>
     </message>
@@ -298,33 +270,24 @@ Klicken Sie und halten Sie den Stylus um weitere Prozessinformationen angezeigt
         <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 type="obsolete">Sie wollen wirklich %1 an diesen Prozess schicken?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Wirklich %1 an diesen
 Prozess senden?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeminformationen</translation>
     </message>
@@ -375,32 +338,24 @@ Prozess senden?</translation>
         <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 type="obsolete">&lt;p&gt;Modell: </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>&lt;br&gt;Model: </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Hersteller:</translation>
     </message>
     <message>
diff --git a/i18n/de/tableviewer.ts b/i18n/de/tableviewer.ts
index c5e31a4..b85c1a0 100644
--- a/i18n/de/tableviewer.ts
+++ b/i18n/de/tableviewer.ts
@@ -1,26 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Kann keinen Standartwert für Typ %1 erstellen, Key nicht hinzugefügt.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Kein gültiger Typ gefunden</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Zurücksetzen</translation>
     </message>
     <message>
         <source>key</source>
         <translation>Schlüssel</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/de/textedit.ts b/i18n/de/textedit.ts
index 4c1ef9a..db91de4 100644
--- a/i18n/de/textedit.ts
+++ b/i18n/de/textedit.ts
@@ -147,30 +147,24 @@
         <source>Unnamed</source>
         <translation>Unbenannt</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Dateirechte</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Font wählen</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">Möchten Sie wirklich die aktuelle Datei &lt;b&gt;löschen&lt;/b&gt; ?
-&lt;BR&gt;Dies kann nicht mehr rückgängig gemacht werden &lt;BR&gt;</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nein</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</translation>
     </message>
     <message>
diff --git a/i18n/de/tictac.ts b/i18n/de/tictac.ts
index cea344a..9c1cc88 100644
--- a/i18n/de/tictac.ts
+++ b/i18n/de/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/de/today.ts b/i18n/de/today.ts
index 4da365e..72691ff 100644
--- a/i18n/de/today.ts
+++ b/i18n/de/today.ts
@@ -6,41 +6,33 @@
         <source>Today</source>
         <translation>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 type="obsolete">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>
-    <message>
         <source>Today Error</source>
         <translation>Today Fehler</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Das Today Modul &apos;%1&apos; verursachte beim letzten Laden einen Absturz. Stellen Sie sicher, dass das Modul richtig installiert ist. Today fährt fort und probiert Module zu laden.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
@@ -66,83 +58,35 @@ dialog zu starten</translation>
         <source>Move Up</source>
         <translation>Hoch</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Runter</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktiv/Reihenfolge</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">Beim Starten
-automatisch laden?
-(nur für Opie)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">Minuten inaktiv</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Verschiedenes</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Soll Heute bei starten automatisch gestartet werden.</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Der Autostart wird erst aktiv, wenn das Gerät über den eingestellten Zeitraum hinaus ausgeschaltet war.</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Symbolgröße</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Symbolgröße in Pixeln einstellen</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Neu laden</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Wie häufig soll &quot;Heute&quot; sich aktualisieren</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">Sekunden</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">niemals</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>Wählen Sie eine Checkbox um ein Plugin zu aktivieren und deaktivieren oder verwenden Sie die Pfeile rechts um die Reihenfolge der Anzeige festzulegen</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Today konfigurieren</translation>
     </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Kleiner Banner</translation>
-    </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>aktualisieren</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Soll Heute bei starten automatisch gestartet werden.</translation>
     </message>
     <message>
diff --git a/i18n/de/todolist.ts b/i18n/de/todolist.ts
index 4e4cbe0..484ca65 100644
--- a/i18n/de/todolist.ts
+++ b/i18n/de/todolist.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="obsolete">&lt;h1&gt;Alarm um %0&gt;&lt;/h1&gt;&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarm um %1&gt;&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nicht eingeteilt</translation>
     </message>
 </context>
@@ -81,206 +77,117 @@
     <message>
         <source>Edit Task</source>
         <translation>Aufgabe editieren</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>leise</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>laut</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Aufgaben</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Neu von Vorlage</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Neue Aufgabe</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Hier klicken, um eine neue Aufgabe zu erzeugen.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Aufgabe editieren</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Hier klicken, um die aktuelle Aufgabe zu ändern.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Aufgabe ansehen</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Löschen...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Hier klicken, um die aktuelle Aufgabe zu löschen.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Alles löschen...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Erledigte Aufgaben löschen</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Senden</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Hier klicken, um die aktuelle Aufgabe an ein anderes Gerät zu senden.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Anzeigen der erledigten Aufgabe</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Nur Anzeige überfälliger Aufgaben</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Fälligkeitsdatum anzeigen</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Schnelleingabe anzeigen</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Datei</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Optionen</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Schnelleingabe</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Dies ist eine Liste aller Aufgaben.
 
 Die Liste zeigt folgende Informationen:
 1. Erledigt- Ein grüner Haken zeigt die Erledigung der Aufgabe. Klicken Sie hier, um die Aufgabe zu erledigen.
 2. Priorität- Eine graphische Repräsentation der Aufgabenpriorität. Hier Doppelklicken, um sie zu ändern.
 3. Beschreibung- Die Aufgabenbeschreibung. Hier Klicken, um die Aufgabe auszuwählen.
 4. Fälligkeit- Zeigt wann die Aufgabe fällig ist. Diese Anzeige kann wahlweise ein- und ausgeschaltet werden, indem man im Menü Optionen-&gt;&quot;Fälligkeitsdatum anzeigen&quot; wählt.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Alle Kategorien</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Kein Speicherplatz mehr</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Es war nicht möglich, 
 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 type="obsolete">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 type="obsolete">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 type="obsolete">Beschreibung</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>fällig bis</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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.
 
@@ -514,28 +421,24 @@ Er ermöglicht die schnelle Erfassung einer neuen Aufgabe. Dieser Bereich kann e
     <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Geben Sie hier zusätzliche Informationen zu der Aufgabe an.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Aufgabenliste</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Zusammenfassung:</translation>
     </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notizen:</translation>
-    </message>
 </context>
 <context>
     <name>TaskEditorStatus</name>
     <message>
         <source>Status:</source>
         <translation>Status:</translation>
     </message>
     <message>
         <source>Click here to set the current status of this task.</source>
         <translation>Klicken Sie hier, um den aktuellen Status des Tasks zu setzen.</translation>
     </message>
     <message>
diff --git a/i18n/de/usermanager.ts b/i18n/de/usermanager.ts
index 56aa2db..ac3c9de 100644
--- a/i18n/de/usermanager.ts
+++ b/i18n/de/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>Gruppe hinzufügen</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Gruppe editieren</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE-Benutzerverwaltung</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Opie-Benutzerverwaltung</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Benutzer hinzufügen</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/de/zsafe.ts b/i18n/de/zsafe.ts
index 235bf46..bb8cd87 100644
--- a/i18n/de/zsafe.ts
+++ b/i18n/de/zsafe.ts
@@ -1,230 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.1.2&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Symbol</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Feld 1</translation>
@@ -418,35 +203,24 @@ Zeigt die Liste der Verzeichnisse und Dateien</translation>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -509,36 +283,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <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>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -553,40 +315,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Wollen Sie wirklich löschen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Nicht löschen</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <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
 müssen sich von der
 Kategorie unterscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Suchen</translation>
     </message>
     <message>
         <source>Entry not found</source>
@@ -697,90 +451,40 @@ sichern</translation>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Bitte warten</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Suche nach Symbolen...</translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation>Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.1.0&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Fehler beim Erstellen von
-../Documents/application
-
-ZSafe wird beendet.
-</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Fehler beim Erstellen von
-..//Documents/application/zsafe
-
-ZSafe wird beendet.
-</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation>Neuer Eintrag</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Kategorie oder Eintrag bearbeiten</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Kategorie oder Eintrag löschen</translation>
     </message>
     <message>
@@ -823,28 +527,24 @@ Dokument erstellen</translation>
 before continuing?</source>
         <translation>vor dem Weitermachen?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Nun müssen sie
 ein Passwort eingeben
 für das neue Dokument.</translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation>&lt;P&gt;Konnte Verzeichnis %1 nicht erstellen.&lt;/P&gt;&lt;P&gt;ZSafe wird beendet&lt;/P&gt;</translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation>ZSafe:
 </translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation>&lt;P&gt;Kein Dokument engegeben. Sie müssen erst ein neues Dokument erstellen&lt;/P&gt;</translation>
     </message>
diff --git a/i18n/dk/datebook.ts b/i18n/dk/datebook.ts
index fdfa81f..cb64e37 100644
--- a/i18n/dk/datebook.ts
+++ b/i18n/dk/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/dk/libliquid.ts b/i18n/dk/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/dk/libliquid.ts
+++ b/i18n/dk/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/dk/libwlan.ts b/i18n/dk/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/dk/libwlan.ts
+++ b/i18n/dk/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/dk/opie-eye.ts b/i18n/dk/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/dk/opie-eye.ts
+++ b/i18n/dk/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/dk/opiemail.ts b/i18n/dk/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/dk/opiemail.ts
+++ b/i18n/dk/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/dk/zsafe.ts b/i18n/dk/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/dk/zsafe.ts
+++ b/i18n/dk/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/en/datebook.ts b/i18n/en/datebook.ts
index afc82e5..9fc7a8b 100644
--- a/i18n/en/datebook.ts
+++ b/i18n/en/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/en/libliquid.ts b/i18n/en/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/en/libliquid.ts
+++ b/i18n/en/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/en/libwlan.ts b/i18n/en/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/en/libwlan.ts
+++ b/i18n/en/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/en/opie-eye.ts b/i18n/en/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/en/opie-eye.ts
+++ b/i18n/en/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/en/opiemail.ts b/i18n/en/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/en/opiemail.ts
+++ b/i18n/en/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/en/zsafe.ts b/i18n/en/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/en/zsafe.ts
+++ b/i18n/en/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/es/addressbook.ts b/i18n/es/addressbook.ts
index 465a321..31dfcf7 100644
--- a/i18n/es/addressbook.ts
+++ b/i18n/es/addressbook.ts
@@ -19,136 +19,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">En blanco</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Contacto</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nuevo</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Borrar</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Buscar</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Escribir Correo a</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Emitir Entrada</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Mis Datos Personales</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>No puedo editar datos, estoy sincronizando</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Mis Datos Personales</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Editar Dirección</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Mis Datos Personales</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Incapaz de guardar la información.
 Libere algo de espacio e
 inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Todos</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">En blanco</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importar vCard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Cerrar busqueda</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Guardar datos</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Configurar</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Tarjetas</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>No Encontrado</translation>
     </message>
     <message>
-        <source>Card</source>
-        <translation type="obsolete">Tarjeta</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Iniciar búsqueda</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>¿Tipo fichero correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sí</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
@@ -170,28 +94,24 @@ no termina en &quot;.vcf&quot;.
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>¿Seguro que quiere añadir el contacto para 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sí a &amp;todo</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Exportar vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>¡Tiene que seleccionar un contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>¡Tiene que elegir un nombre de fichero!</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1385,180 +1305,13 @@ suministra gratis!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Exportar vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Mis Datos Personales</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Tfno. trabajo</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax trabajo</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Móvil trabajo</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Correo-e</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Correos-e</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Teléfono casa</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax casa</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Móvil personal</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Oficina</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Profesión</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Ayudante</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Superior</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Cónyuge</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Género</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Cumpleaños</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Aniversario</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Apodo</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Hijos</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Título</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">1º apellido</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">2º apellido</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Sufijo</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Archivar como</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Cargo</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Departamento</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Compañía</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Calle trabajo</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Ciudad trabajo</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Provincia trabajo</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Cód.postal trabajo</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">País trabajo</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Busca trabajo</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Web trabajo</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Calle casa</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Ciudad casa</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Provincia casa</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Cód.postal casa</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">País casa</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Web personal</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notas</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/es/advancedfm.ts b/i18n/es/advancedfm.ts
index 68de7e9..f919d53 100644
--- a/i18n/es/advancedfm.ts
+++ b/i18n/es/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>No puedo renombrar</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Ese directorio no existe</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Copiar como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Salida Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisión del Gestor de Ficheros Avanzado</translation>
     </message>
     <message>
@@ -137,141 +133,60 @@
         <source>Copy </source>
         <translation>Copiar </translation>
     </message>
     <message>
         <source> As</source>
         <translation> Como</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar misma carpeta</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">No pude copiar
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">a
-</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">No puede mover
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Añadir a Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acciones</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleccionar todo</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">¿Confirma el borrado
-de los ficheros %1?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>¿Borrar directorio?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">¿Confirma la copia
-de los ficheros %1?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>¡El fichero existe!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-existe. ¿Lo sobrescribo?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete"> ya existe.
-¿Seguro que quiere borrarlo?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 existe. ¿Lo sobreescribo?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">No pude copiar %1 a %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-copyright 2002-2003 por
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-y está bajo licencia GPL
-</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Directorio de favoritos</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Borrar el directorio actual de los favoritos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">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 type="obsolete">¿Seguro que quiere borrar %1
-y todo su contenido?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">¿Confirma el borrado
-de %1?</translation>
-    </message>
-    <message>
         <source>AdvancedFm :: </source>
         <translation>Gestor de Ficheros Avanzado :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation> kB libres</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Cambiar a la Vista 1</translation>
     </message>
     <message>
diff --git a/i18n/es/appearance.ts b/i18n/es/appearance.ts
index 3efa938..b1094af 100644
--- a/i18n/es/appearance.ts
+++ b/i18n/es/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Guardar</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Forzar estilo en todas las aplicaciones.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Desactivar estilo en estas aplicaciones (puede usarse el comodín &lt;b&gt;*&lt;/b&gt;):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Ficheros binarios</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Estilo pestañas:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Pestañas</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Pestañas con iconos</translation>
     </message>
     <message>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Reiniciar</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">¿Quiere reiniciar ahora?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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.
@@ -161,52 +129,24 @@ Pulse aquí para seleccionar un esquema disponible.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Pulse aquí para cambiar los colores del esquema de color actual.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Pulse aquí para borrar el esquema de color seleccionado en la lista de la izq.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Pulse aquí para nombrar y guardar el esquema de color actual.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Pulse aquí para permitir que todas las aplicaciones usen la configuración de apariencia global.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Si algunas aplicaciones no se ven bien con la configuración de apariencia global, algunas características pueden desaparecer.
-
-Esta área le permite seleccionar un aplicación y qué funciones desea deshabilitar.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Pulse aquí para añadir una aplicación de la lista superior.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Pulse aquí para borrar la aplicación seleccionada actualmente.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Pulse aquí para subir la aplicación seleccionada en la lista.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Pulse aquí para bajar la aplicación seleccionada en la lista.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Pulse aquí para seleccionar un estilo para los diálogos con pestañas (como esta). Los estilos disponibles son:
 
 1. Pestañas - pestañas normales con sólo texto
 2. Pestañas con iconos - pestañas con iconos, el texto aparece solo en la actual
 3. Lista desplegable - una lista vertical de pestañas
 4. Lista desplegable con iconos - una lista vertical de pestañas con iconos</translation>
diff --git a/i18n/es/aqpkg.ts b/i18n/es/aqpkg.ts
index 8e70cf9..6f064ac 100644
--- a/i18n/es/aqpkg.ts
+++ b/i18n/es/aqpkg.ts
@@ -196,56 +196,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>No pude abrir fichero de estado - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>No pude crear fichero temporal de estado - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>No pude iniciar proceso ipkg</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">No pude abrir :</translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Creando directorio </translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Enlazando %1 a %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Fallo al enlazar %1 a %2</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Eliminado %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Fallo al borrar %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Eliminado </translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Fallo al borrar </translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation>Error al iniciar el proceso ipkg-link</translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished">Error al crear enlace simbólico
 </translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
@@ -508,42 +476,34 @@ Opie/Qtopia está corriendo!
         <translation>¿Desea borrar o reinstalar
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Borrar o reinstalar</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Reinstalar</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>¿Desea borrar o actualizar
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Borrar o actualizar</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">U</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Actualizando lanzador...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Descripción&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/es/backup.ts b/i18n/es/backup.ts
index d5b02db..cb599f1 100644
--- a/i18n/es/backup.ts
+++ b/i18n/es/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Copiar y restaurar... trabajando...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Error del Sistema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensaje</translation>
@@ -27,44 +23,36 @@
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalles</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Copia y restauración.. ¡¡Falló!!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Copia exitosa.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Por favor, seleccione algo a restaurar.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Restauración fallida.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Incapaz de abrir fichero: %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Restauración exitosa.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation>Copia Correcta.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Restauración Correcta.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation>Copiando...</translation>
     </message>
     <message>
@@ -98,87 +86,59 @@
         <source>Backup And Restore</source>
         <translation>Copiar y Restaurar</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Copia de seguridad</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicaciones</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Guardar en</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Copia de seguridad</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restaurar</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleccionar Origen</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Columna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurar</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Actualizar lista ficheros</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation>Sitios</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Añadir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation>Destino</translation>
     </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Tipo</translation>
-    </message>
-    <message>
-        <source>User Data (Configuration + PIM)</source>
-        <translation type="obsolete">Datos de Usuario (Configuración + PIM)</translation>
-    </message>
-    <message>
-        <source>Full Backup (Root File System)</source>
-        <translation type="obsolete">Copia Completa (Sistema de Ficheros Raíz)</translation>
-    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Información de error</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Mensaje de error:</translation>
     </message>
     <message>
diff --git a/i18n/es/calculator.ts b/i18n/es/calculator.ts
index cc0174c..cdd9c02 100644
--- a/i18n/es/calculator.ts
+++ b/i18n/es/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Calculadora Experimental</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculadora</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/es/calibrate.ts b/i18n/es/calibrate.ts
index e8bc32d..e933e0e 100644
--- a/i18n/es/calibrate.ts
+++ b/i18n/es/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pulse sobre las cruces firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Bienvenido a Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/es/checkbook.ts b/i18n/es/checkbook.ts
index 5d859ea..a5b8fbd 100644
--- a/i18n/es/checkbook.ts
+++ b/i18n/es/checkbook.ts
@@ -29,48 +29,24 @@
         <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 type="obsolete">Ahorros</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Comprobando</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Dinero mercado</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Fondo mutuo</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -93,32 +69,24 @@
         <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 type="obsolete">Balance actual: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -173,28 +141,24 @@ Para ordenar las entradas por un campo específico, pulse el nombre de la column
         <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 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>
@@ -646,109 +610,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Automóvil</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Facturas</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CDs</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Ropa</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Ordenador</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVDs</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Electrónica</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Diversión</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Comida</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Combustible</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Varios</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Películas</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Alquiler</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="obsolete">Viaje</translation>
-    </message>
-    <message>
         <source>Debit Charge</source>
         <translation>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 type="obsolete">Trabajo</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Miembro familiar</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">Crédito misc</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>Pago automático</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Efectivo</translation>
     </message>
-    <message>
-        <source>Electronics</source>
-        <translation type="obsolete">Electrónica</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/es/clock.ts b/i18n/es/clock.ts
index 93b96f1..c500601 100644
--- a/i18n/es/clock.ts
+++ b/i18n/es/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Cabezadita</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Reloj</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Crono</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Empezar</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Borrar</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Fijar alarma</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarma activada</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarma desactivada</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Fijar fecha y hora.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Reloj: alarma perdida.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarma ajustada: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -234,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Fijar Alarma</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Cabezadita
-(minutos)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">alarma mp3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Todo</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/es/datebook.ts b/i18n/es/datebook.ts
index 236fe75..758aa12 100644
--- a/i18n/es/datebook.ts
+++ b/i18n/es/datebook.ts
@@ -332,24 +332,32 @@ Libere espacio y vuelva a intentarlo.
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -405,59 +413,24 @@ Libere espacio y vuelva a intentarlo.
     </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>
-        <comment>Friday</comment>
-        <translation type="obsolete">Vi</translation>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Do</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Calendario</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Repetición...</translation>
     </message>
     <message>
@@ -570,28 +543,24 @@ Libere espacio y vuelva a intentarlo.
     <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="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>
diff --git a/i18n/es/embeddedkonsole.ts b/i18n/es/embeddedkonsole.ts
index ca8749c..be5f3fe 100644
--- a/i18n/es/embeddedkonsole.ts
+++ b/i18n/es/embeddedkonsole.ts
@@ -19,44 +19,24 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandos sugeridos&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Micro</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Fija pequeña</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Fija media</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">Letra</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opciones</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nueva</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espacio</translation>
     </message>
     <message>
@@ -75,52 +55,36 @@
         <source>Paste</source>
         <translation>Pegar</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Mostar lista comandos</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ocultar lista comandos</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Pestañas abajo</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Verde sobre negro</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Negro sobre blanco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanco sobre negro</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Blanco sobre transparente</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Negro sobre rojo</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rojo sobre negro</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Verde sobre amarillo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul sobre magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sobre azul</translation>
     </message>
     <message>
@@ -139,28 +103,24 @@
         <source>Amber on Black</source>
         <translation>Ámbar sobre negro</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colores</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Editar rápido</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Ninguna</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Izquierda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Derecha</translation>
     </message>
     <message>
@@ -183,28 +143,24 @@
         <source>Command List</source>
         <translation>Lista comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Cortar línea</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Timbre</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Pestañas arriba</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation>Konsole</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/es/fifteen.ts b/i18n/es/fifteen.ts
index e63a22e..94d7706 100644
--- a/i18n/es/fifteen.ts
+++ b/i18n/es/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Revolver</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Resolver</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Juego</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quince piezas</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/formatter.ts b/i18n/es/formatter.ts
index 7838566..f8b02af 100644
--- a/i18n/es/formatter.ts
+++ b/i18n/es/formatter.ts
@@ -13,76 +13,50 @@
         <source>File Systems</source>
         <translation>Sistemas ficheros</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatear</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Principal</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">Atención:
-¡¡Cambiar los parámetros de esta página
-puede causar que susistema deje de
-funcionar correctamente!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Editar fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Verificar disco</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Punto montaje</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">¿¡¿Formatear?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>¿¡¿Confirma el formateo
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-con </translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete"> sistema de ficheros?!?
-¡¡Perderá todos sus datos!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>No pude formatear.
 Tipo desconocido</translation>
@@ -119,50 +93,36 @@ Device is busy!</source>
     </message>
     <message>
         <source>No such device!</source>
         <translation>¡No existe el dispositivo!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 ha sido formateado con éxito.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Intentando montar.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>¡Fallo al montar tarjeta!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-ha sido montado con éxito.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Ahora puede cerrar la ventana de salida.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Interno</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Tipo almacenamiento : </translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Total: %1 KB ( %d MB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Usado: %1 KB ( %d MB)
 </translation>
     </message>
     <message>
diff --git a/i18n/es/go.ts b/i18n/es/go.ts
index a3f512f..240f6da 100644
--- a/i18n/es/go.ts
+++ b/i18n/es/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Empate.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Yo paso</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisioneras: blancas %1, negras %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Go</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/es/kbill.ts b/i18n/es/kbill.ts
index e0e82f0..76830f0 100644
--- a/i18n/es/kbill.ts
+++ b/i18n/es/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Fichero</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Parar Juego</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;La Historia&lt;/b&gt;&lt;p&gt;Una vez más, ¡el destino del mundo reposa en tus manos!  Un hacker del demonio, conocido sólo por su apodo &apos;Bill&apos;, ha creado el virus informático definitivo.  Un virus tan potente que tiene la capacidad de transmutar un ordenador corriente en una tostadora.  (¡oooh!) &apos;Bill&apos; se ha clonado a sí mismo en tropecientosmil micro-Bills.  Su único propósito es entregar el nefasto virus, que ha sido inteligentemente camuflado como un popular sistema operativo.  Como Administrador de Sistemas y Exterminador, tu trabajo es impedir que Bill tenga éxito en su tarea.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>La historia de KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Las reglas de KBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;Las Reglas&lt;/b&gt;&lt;p&gt;kBill ha sido diseñado y desarrollado con esmero a fin de ser tan fácilmente usado por toda la familia como lo puede ser por la pequeña Sally.  Años --no-- días de comprobaciones y consultas con los más baratos diseñadores humanos de interfaces han tenido como resultado un juego que es fácil de usar, aunque nada que ver con Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Rebentar un Bill (clic)&lt;/LI&gt;&lt;LI&gt;Reiniciar un ordenador (clic)&lt;/LI&gt;&lt;LI&gt;Recoger un SO robado &amp; devolverlo a su ordenador (arrastrar)&lt;/LI&gt;&lt;LI&gt;Arrastrar el cubo para extinguir las chispas&lt;/LI&gt;&lt;LI&gt;Puntuación basada en la duración toral, con bonus por matar Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Mientras descansas, puedes probablemente resolverlo por ti mismo. Nosotros lo hicimos, así que no puede ser muy difícil</translation>
     </message>
     <message>
diff --git a/i18n/es/keypebble.ts b/i18n/es/keypebble.ts
index 86c8f70..c806450 100644
--- a/i18n/es/keypebble.ts
+++ b/i18n/es/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>Error de lectura: QSocket informó de un error
 leyendo datos. La máquina remota probablemente
 se desconectó.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket devolvió un código de error no válido</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Esperando inicialización servidor...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Esperando nombre escritorio...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Conectado a %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Error de protocolo: Identificador de mensaje %1 cuando esperaba actualización.</translation>
     </message>
     <message>
diff --git a/i18n/es/launchersettings.ts b/i18n/es/launchersettings.ts
index aa6a9e7..cd8d3fa 100644
--- a/i18n/es/launchersettings.ts
+++ b/i18n/es/launchersettings.ts
@@ -203,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/es/libaboutapplet.ts b/i18n/es/libaboutapplet.ts
index 7b40f83..fc023eb 100644
--- a/i18n/es/libaboutapplet.ts
+++ b/i18n/es/libaboutapplet.ts
@@ -8,68 +8,40 @@
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
 </context>
 <context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;E</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Autores</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Report</source>
         <translation>Informe de fallos</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;El software siempre puede mejorarse, y el Equipo de Opie está listo para hacerlo. No obstante, usted - el usuario - debe decirnos qué cree que no funciona como debería o puede mejorarse.&lt;/p&gt;
 &lt;p&gt;</translation>
     </message>
     <message>
         <source>Join</source>
diff --git a/i18n/es/libbatteryapplet.ts b/i18n/es/libbatteryapplet.ts
index 18a9fee..e99b166 100644
--- a/i18n/es/libbatteryapplet.ts
+++ b/i18n/es/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Cerrar</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>Cargando</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Porcentaje batería restante</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Estado batería:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bueno</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Bajo</translation>
     </message>
     <message>
@@ -41,52 +33,36 @@
         <source>On backup power</source>
         <translation>Alimentación emergencia</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentación conectada</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentación externa desconectada</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Duración batería restante</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Estado de la batería</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>no pude abrir fichero</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Cargando ambos dispositivos</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Porcentaje batería restante:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Duración batería restante:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Sin chaqueta con batería insertada</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/es/libliquid.ts b/i18n/es/libliquid.ts
index f5bb58e..75e38d7 100644
--- a/i18n/es/libliquid.ts
+++ b/i18n/es/libliquid.ts
@@ -1,75 +1,68 @@
 <!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 type="unfinished">Estilo Líquido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Sin transparencia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Punteado, color de fondo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Punteado, color de botón</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Punteado translúcido, color de fondo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Punteado translúcido, color de botón</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Transparencia propia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Color del menú</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Color del texto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Opacidad</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Usar texto del munú sombreado</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Botones de barra de herramientas planos</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Contraste punteado</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Estilo de alto rendimiento Liquid por Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libopiepim2.ts b/i18n/es/libopiepim2.ts
index 83f57ed..0394a03 100644
--- a/i18n/es/libopiepim2.ts
+++ b/i18n/es/libopiepim2.ts
@@ -1,164 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Botón Calendario</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Botón Contactos</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Botón Menú</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Botón Correo</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Botón Inicio</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Botón Grabación</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotación de la pantalla</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Minúscula+Arriba</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Minúscula+Abajo</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Minúscula+Derecha</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Minúscula+Izquierda</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Mayúscula+Arriba</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Mayúscula+Abajo</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Mayúscula+Derecha</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Mayúscula+Izquierda</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Tono:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Saturación:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Valor:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rojo:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Seleccione color</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Más</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Más...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nombre:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Mediana</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Pequeña</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Cita repetitiva </translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Día</translation>
@@ -357,255 +207,24 @@ y </translation>
         <translation type="unfinished">mese(s)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">año(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Cada</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Cita repetitiva </translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ninguno</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Día</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mes</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Año</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Cada:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frecuencia</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Finalizar el:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sin fecha final</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repetir el</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mie</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Jue</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vie</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Cada</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">VarSemana</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sin fecha final</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">días</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">día</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semanas</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">meses</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mes</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">años</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">año</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete"> y </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-y </translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, y </translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">No repetir</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">día(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repetir el</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mie</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Jue</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vie</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semana(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Repetir cada</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Día</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mese(s)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">año(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Cada</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">en </translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Hora:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Tomar hora:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -659,68 +278,26 @@ y </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Diálogo Fichero</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documentos</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Ficheros</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -903,32 +480,24 @@ y </translation>
         <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 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 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>
diff --git a/i18n/es/libopieui2.ts b/i18n/es/libopieui2.ts
index 854ddfe..fe4db25 100644
--- a/i18n/es/libopieui2.ts
+++ b/i18n/es/libopieui2.ts
@@ -1,418 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Botón Calendario</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Botón Contactos</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Botón Menú</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Botón Correo</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Botón Inicio</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Botón Grabación</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotación de la pantalla</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Minúscula+Arriba</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Minúscula+Abajo</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Minúscula+Derecha</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Minúscula+Izquierda</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Mayúscula+Arriba</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Mayúscula+Abajo</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Mayúscula+Derecha</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Mayúscula+Izquierda</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Tono:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Saturación:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Valor:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rojo:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Seleccione color</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Más</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Más...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Diálogo Fichero</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Guardar</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nombre:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Mediana</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Pequeña</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">El Zorro Marrón Saltó Sobre El Perro Perezoso</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Cita repetitiva </translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ninguno</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Día</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mes</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Año</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Cada:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frecuencia</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Finalizar el:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sin fecha final</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repetir el</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mie</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Jue</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vie</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Cada</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">VarSemana</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sin fecha final</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">días</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">día</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semanas</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">meses</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mes</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">años</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">año</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete"> y </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-y </translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, y </translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">No repetir</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">día(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repetir el</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mie</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Jue</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vie</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semana(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Repetir cada</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Día</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mese(s)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">año(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Cada</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -541,289 +137,39 @@ y </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamaño</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Fecha</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo mime</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 type="obsolete">Prioridad:</translation>
-    </message>
-    <message>
-        <source>Very high</source>
-        <translation type="obsolete">Muy alta</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Alta</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normal</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Baja</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Muy baja</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Progreso:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Fecha lí­mite:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Categoría:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Correo-e preferido: </translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Oficina: </translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Web trabajo: </translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Teléfono trabajo: </translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Fax trabajo: </translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Móvil trabajo: </translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Busca trabajo: </translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Página web personal: </translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Teléfono casa: </translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Fax casa: </translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Móvil personal: </translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Todos correos-e: </translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Profesión: </translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Ayudante: </translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Superior: </translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Hombre</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Mujer</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Género: </translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Cónyuge: </translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Cumpleaños: </translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Aniversario: </translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Hijos: </translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Apodo: </translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notas: </translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Localidad: </translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Esta cita dura todo el día</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Esta cita dura varios días</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Inicio:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Final:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Nota:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Cada</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 cada </translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">El %1 cada </translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Cada </translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lunes</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Martes</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Miércoles</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Jueves</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Viernes</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Sábado</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Domingo</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <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 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 type="obsolete">El %1 %2 de cada</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Ninguno</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">º</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">º</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">º</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">º</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/es/libqpe.ts b/i18n/es/libqpe.ts
index c5da1af..fc1f1f4 100644
--- a/i18n/es/libqpe.ts
+++ b/i18n/es/libqpe.ts
@@ -185,28 +185,24 @@ editando las categorías.</translation>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Cadena no encontrada.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Final alcanzado, empezando por el principio</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Buscar</translation>
     </message>
     <message>
@@ -443,62 +439,48 @@ Please free up some space
 before entering data</source>
         <translation>Incapaz de crear ficheros de inicio.
 Por favor, libere espacio antes
 de introducir datos</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Incapaz de programar alarma.
 Libere memoria e intételo de nuevo.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>día</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mes</translation>
     </message>
     <message>
         <source>year</source>
         <translation>año</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">¿Seguro que quiere borrar
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Todo</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>En blanco</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Dirección trabajo:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -781,44 +763,24 @@ Libere memoria e intételo de nuevo.</translation>
         <source>Fri</source>
         <translation>Vie</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Pulse para cerrar esta ventana, descartando los cambios.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Pulse para cerrar esta ventana.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Pulse para cerrar esta ventana y aplicar los cambios.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Pulse para hacer esta ventana móvil.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Pulse para hacer que esta ventana use toda la pantalla disponible.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;No se dispone de ayuda exhaustiva para esta aplicación, sin embargo hay ayuda sensible al contexto.&lt;p&gt;Para usar esta ayuda:&lt;p&gt;&lt;ol&gt;&lt;li&gt;mantenga pulsado el botón de ayuda.&lt;li&gt;cuando la barra de título muestre &lt;b&gt;Qué es esto...&lt;/b&gt;, pulse en cualquier control.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qué es esto...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;¿Seguro que quiere borrar
 %1?&lt;/qt&gt;</translation>
@@ -863,28 +825,24 @@ Libere memoria e intételo de nuevo.</translation>
         <source>Oct</source>
         <translation>Oct</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Error</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">D</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/es/libtodayaddressbookplugin.ts b/i18n/es/libtodayaddressbookplugin.ts
index 82b2c50..c86c173 100644
--- a/i18n/es/libtodayaddressbookplugin.ts
+++ b/i18n/es/libtodayaddressbookplugin.ts
@@ -1,44 +1,32 @@
 <!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 type="obsolete">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 type="obsolete">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>
-    </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>
diff --git a/i18n/es/libtodaydatebookplugin.ts b/i18n/es/libtodaydatebookplugin.ts
index 8d1a8f3..7fd84ec 100644
--- a/i18n/es/libtodaydatebookplugin.ts
+++ b/i18n/es/libtodaydatebookplugin.ts
@@ -6,83 +6,24 @@
         <translation>[con alarma]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Día completo</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Mostrar localidad</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Mostrar notas</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Verifique esto si la nota adjunta a una cita debe ser mostrada en cada una</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Mostrar sólo citas
-posteriores</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Verifique esto si sólo las citas porteriores al momento actual deben ser mostradas</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">¿Cuántas 
-citas
-deben ser
-mostradas?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Cuántas citas deben ser mostradas como máximo. En orden cronológico</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Cuántos días mas</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Cuántos días más deben estar en el rango</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">día(s)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">sólo hoy</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Mostrar localidad</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Verifique esto si la localización de una cita debe ser mostrada para cada una</translation>
diff --git a/i18n/es/libtodaytodolistplugin.ts b/i18n/es/libtodaytodolistplugin.ts
index 4a4fdd5..05c99a8 100644
--- a/i18n/es/libtodaytodolistplugin.ts
+++ b/i18n/es/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <source>tasks shown</source>
         <translation>tareas mostradas</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Cortar línea tras X caracteres</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">tareas mostradas </translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Fija el número máximo de tareas que deben mostrarse</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">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 type="obsolete">Después de cuántos caracteres la información de la tarea debe ser cortada</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/es/libtodayweatherplugin.ts b/i18n/es/libtodayweatherplugin.ts
index ca37a4c..14f65c9 100644
--- a/i18n/es/libtodayweatherplugin.ts
+++ b/i18n/es/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Pres: </translation>
         <source>SE </source>
         <translation>SE</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>kph</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>mph</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/libwlan.ts b/i18n/es/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/es/libwlan.ts
+++ b/i18n/es/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/es/mindbreaker.ts b/i18n/es/mindbreaker.ts
index 53f1591..5bb7e25 100644
--- a/i18n/es/mindbreaker.ts
+++ b/i18n/es/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>Promedio: %1 turnos (%2 juegos)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Ir%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">ActualIr%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Respuesta%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Reiniciar estadísticas</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>¿Borrar índice victorias?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
diff --git a/i18n/es/minesweep.ts b/i18n/es/minesweep.ts
index 3396887..a2b64c3 100644
--- a/i18n/es/minesweep.ts
+++ b/i18n/es/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>¡Ganaste!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>¡Explotaste!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Busca Minas</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Principiante</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Experto</translation>
     </message>
     <message>
diff --git a/i18n/es/opie-console.ts b/i18n/es/opie-console.ts
index 109e575..3b52880 100644
--- a/i18n/es/opie-console.ts
+++ b/i18n/es/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>Fichero sincronizado</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Numero marcado: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallo</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Falló la marcación del número.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Cancelando...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Buscando modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Inicializando...</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Tipo de terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Esquema de color</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Tamaño letra</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">pequeña</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">mediana</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">grande</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Conversiones ruptura de línea</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Bajo límites</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Fuera de límites</translation>
     </message>
     <message>
diff --git a/i18n/es/opie-eye.ts b/i18n/es/opie-eye.ts
index 659543e..539b5e2 100644
--- a/i18n/es/opie-eye.ts
+++ b/i18n/es/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation>Tamaño de las miniaturas:</translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation>Mostrar Barra de Herramientas al Iniciar</translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation>Salvar el estado de pantalla completa/autorrotación</translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation>Ver Información de la Imagen</translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation>Activar Autorrotación</translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation>Pasar a la Imagen Anterior</translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation>Pasar a Pantalla Completa</translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation>Pasar a Miniatura</translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation>Ver como</translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation>Emitir Elemento Actual</translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation>Seleccionar Sistema de Ficheros</translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation>Mostrar todos los ficheros</translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation>Confirmar Borrado</translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Miniatura e Información de la Imagen</translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation>Miniatura y Nombre</translation>
     </message>
     <message>
diff --git a/i18n/es/opie-login.ts b/i18n/es/opie-login.ts
index 6961a38..d8499cf 100644
--- a/i18n/es/opie-login.ts
+++ b/i18n/es/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 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 type="obsolete">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>
@@ -41,54 +37,36 @@ precisión para calibrar la pantalla.</translation>
 </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 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>
diff --git a/i18n/es/opieirc.ts b/i18n/es/opieirc.ts
index 1c83653..6339ec8 100644
--- a/i18n/es/opieirc.ts
+++ b/i18n/es/opieirc.ts
@@ -64,28 +64,24 @@
         <source>Talking on channel</source>
         <translation>Hablando de canales</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Discusión de canales</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Escriba aquí sus mensajes para participar en la dicusión de canales</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Petición</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Vesión</translation>
     </message>
     <message>
@@ -125,116 +121,68 @@
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="obsolete">Recibido comando numérico desatendido : </translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="obsolete">Recibido comando ctcp desatendido : </translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="obsolete">Recibido comando literal desatendido : </translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Unión de canal inexistente - ¿desincronizado?</translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="obsolete">canal unido</translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Persona ya se ha unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Ya te has unido al canal - ¿desincronizado?</translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="obsolete">Deja el canal</translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="obsolete">dejar canal</translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Persona separación no encontrada - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>No encontré canal para la parte - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Mensaje del canal de emisor desconocido</translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="obsolete">Mensaje del canal con canal desconocido</translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Recibido PRIVMSG de tipo desconocido</translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="obsolete">Ahora es conocido como </translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="obsolete">es ahora conocimo como</translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Cambio de apodo de una persona desconocida</translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="obsolete">ha salido </translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Ha salido persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>cambió asunto a </translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Asundo del canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Recibido un CTCP PING de </translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">Recibido un CTCP VERSION de </translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION con persona desconocida - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION con canal desconocido - ¿desincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION con mal destinatario</translation>
     </message>
     <message>
@@ -313,32 +261,24 @@
         <source>You left channel %1</source>
         <translation>Ha dejado el canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 dejó el canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Mensaje del canal con canal desconocido %1</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">Ahora es conocido como %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 es ahora conocido como %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 ha salido (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -528,36 +468,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nombre de perfil requerido</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nombre de máquina requerido</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">Puerto requerido</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>Apodo requerido</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">Nombre real requerido</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>La lista del canal necesita contener una
 lista separada por comas de nombres
 de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -590,28 +522,24 @@ de canales que empiezan por &apos;#&apos; o &apos;+&apos;</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editar el perfil de servidor actualmente seleccionado</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Añadir un nuevo perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Conexión a</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Mensajes del servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Escriba aquí comandos. Una lista de comandos disponibles puede encontrarse en la ayuda de OpieRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/es/opiemail.ts b/i18n/es/opiemail.ts
index 633bc17..96cf6fa 100644
--- a/i18n/es/opiemail.ts
+++ b/i18n/es/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</source>
         <translation>Remitente</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Tamaño</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Fecha</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">Servidor</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation>Grupos a los que está suscrito</translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -352,25 +404,25 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get newsgroup list from server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Obtener lista de grupos desde el servidor</translation>
     </message>
     <message>
         <source>Retrieve the list of groups from server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter a filter string here.
 Then hit &quot;get newsgroup list&quot; again and only groups starting 
 with that filter will be listed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -443,163 +495,163 @@ with that filter will be listed.</source>
 <context>
     <name>OpieMail</name>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mail queue flushed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Borrar Correo</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Copy/Move this mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error creating new Folder</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Error al crear un nuevo Directorio</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&lt;center&gt;Error al crear&lt;br&gt;un nuevo directorio - saliendo.&lt;/center&gt;</translation>
     </message>
     <message>
         <source>Define a smtp account first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cuenta</translation>
     </message>
     <message>
         <source>Name of the Account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nombre de la Cuenta</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidor</translation>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Puerto</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Usar SSL:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec imapd</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Usuario</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Contraseña</translation>
     </message>
     <message>
         <source>ask before downloading large mails</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Cuenta</translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Nombre de la Cuenta</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Contraseña</translation>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Puerto</translation>
     </message>
     <message>
         <source>Server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Servidor</translation>
     </message>
     <message>
         <source>Port of the SMTP Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Usuario</translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Usar SSL:</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ssh $SERVER exec</translation>
     </message>
 </context>
 <context>
     <name>SelectMailTypeUI</name>
     <message>
         <source>Select Type</source>
         <translation>Seleccionar Tipo</translation>
     </message>
     <message>
         <source>Select Account Type</source>
         <translation>Seleccionar Tipo de Cuenta</translation>
     </message>
@@ -653,137 +705,146 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">De</translation>
     </message>
     <message>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Para</translation>
     </message>
     <message>
         <source>Cc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Fecha</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Error</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot reply yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ok</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ok</translation>
     </message>
     <message>
         <source>&lt;p&gt;The mail body is not yet downloaded, so you cannot forward yet.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Borrar Correo</translation>
     </message>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Correo</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Forward</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show Html</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete Mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Borrar Correo</translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tamaño</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation>Seleccione la Cuenta SMTP</translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/es/opierec.ts b/i18n/es/opierec.ts
index a60be23..2997349 100644
--- a/i18n/es/opierec.ts
+++ b/i18n/es/opierec.ts
@@ -28,72 +28,40 @@
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheros</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Tasa muestreo</translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">44100</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">32000</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">22050</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">16000</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">11025</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">8000</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>Tamaño límite</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ilimitado</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Directorio archivo</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Bits de muestreo</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">16</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">8</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>Entrada</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Salida</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opciones</translation>
     </message>
     <message>
@@ -104,58 +72,36 @@
         <source>Low Disk Space</source>
         <translation>Poco espacio en disco</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Está grabando con poco
 espacio, o una tarjeta
 no ha sido reconocida</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">segundos</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">¿Seguro que quiere &lt;font size=+2&gt;&lt;B&gt;borrar&lt;/B&gt;&lt;/font&gt;
-el fichero seleccionado?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sí</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">No</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>No pude borrar el fichero.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Por favor, seleccione el fichero a reproducir</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <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>
@@ -172,52 +118,32 @@ el fichero seleccionado?</translation>
         <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 type="obsolete">Gra</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Lugar</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">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 type="obsolete">Mudo auto</translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>mudo</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Parar</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/es/osearch.ts b/i18n/es/osearch.ts
index 774377d..5b58563 100644
--- a/i18n/es/osearch.ts
+++ b/i18n/es/osearch.ts
@@ -1,52 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>Buscador O</translation>
     </message>
     <message>
-        <source>adressbook</source>
-        <translation type="obsolete">contactos</translation>
-    </message>
-    <message>
-        <source>todo</source>
-        <translation type="obsolete">tareas</translation>
-    </message>
-    <message>
-        <source>datebook</source>
-        <translation type="obsolete">calendario</translation>
-    </message>
-    <message>
-        <source>applications</source>
-        <translation type="obsolete">aplicaciones</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="obsolete">documentos</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Buscar</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Buscar todo</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">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>
@@ -111,52 +87,36 @@
         <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 type="obsolete">mostrar tareas completadas</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">mostrar sucesos pasados</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">buscar en fechas</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Fichero: </translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Enlace: </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Tipo MIME: </translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">buscar contenido</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>buscando %1</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>
diff --git a/i18n/es/oxygen.ts b/i18n/es/oxygen.ts
index 28fbcff..47f9b3d 100644
--- a/i18n/es/oxygen.ts
+++ b/i18n/es/oxygen.ts
@@ -40,40 +40,28 @@
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronegatividad</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Radio atómico</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Energía ionización</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Densidad</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Punto ebullición</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Punto fusión</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
diff --git a/i18n/es/patience.ts b/i18n/es/patience.ts
index 00ea323..7a41fb7 100644
--- a/i18n/es/patience.ts
+++ b/i18n/es/patience.ts
@@ -5,68 +5,44 @@
         <source>Patience</source>
         <translation>Paciencia</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Casilla libre</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jugar</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">Cambiar &amp;reverso cartas</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Saltar a la posición</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Sobre</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jugar</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Cambiar reverso cartas</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Saltar a la posición</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Volver una carta</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Configurar</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Volver tres cartas</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation>Trampa</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Arpa</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Club de té</translation>
     </message>
     <message>
diff --git a/i18n/es/qpe.ts b/i18n/es/qpe.ts
index e77e4ec..39beb4b 100644
--- a/i18n/es/qpe.ts
+++ b/i18n/es/qpe.ts
@@ -57,98 +57,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Problema en la aplicación</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 no responde.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;¿Quiere forzar la salida de la aplicación?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Pulse las crucecitas firmemente y con
 precisión para calibrar la pantalla.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Bienvenido a Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documentos</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Ver como iconos</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Ver como lista</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">La batería está muy baja.</translation>
-    </message>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">¡El nivel de la batería es crítico!
-¡Apágueme o enchúfeme!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">La batería de respaldo está muy baja.
-Por favor cárguela.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">tarjeta de visita</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Información</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;La fecha del sistema parece no ser válida.
-(%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Estado de la Batería</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -196,32 +129,24 @@ Por favor cárguela.</translation>
         <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>
@@ -238,107 +163,44 @@ Por favor cárguela.</translation>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 ficheros</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Todos los tipos de ficheros</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Ver como documentos</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Medio insertado</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Qué ficheros</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Imagen</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Texto</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Vídeo</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Enlace a aplicaciones</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Limitar búsqueda al directorio: (no se usa aún)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Añadir</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">Su decisión será guardada en el medio.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">No preguntar otra vez por este medio</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">Se insertó un &lt;b&gt;medio de almacenamiento&lt;/b&gt;. ¿Examino sus ficheros?</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Qué ficheros</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
@@ -372,31 +234,24 @@ Por favor cárguela.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></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>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -424,36 +279,24 @@ Por favor cárguela.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Información</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La fecha del sistema parece no ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;¿Quiere poner en hora el reloj?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">¡El nivel de la batería es crítico!
-¡Apágueme o enchúfeme!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">La batería de respaldo está muy baja.
-Por favor cárguela.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">tarjeta de visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -518,77 +361,55 @@ immediately.</source>
         <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="obsolete">&lt;p&gt;
-Estas opciones de terminación se usan principalmente en las pruebas y desarrollo del sistema Opie. En un entorno normal, estos conceptos son innecesarios.</translation>
-    </message>
-    <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Apagar...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Conexión de sincronización</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Denegar</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permitir</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Un sistema no autorizado está pidiendo acceso a este dispositivo.&lt;p&gt;Si está usando una versión de Desktop Qtopia anterior a la 1.5.1, por favor actualícese.</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Un sistema no reconocido está pidiendo acceso a este dispositivo.&lt;p&gt;Si acaba de empezar su primera sincronización, esto es normal.</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Sincronizando</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Contactos&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/security.ts b/i18n/es/security.ts
index f026bb3..44e6da9 100644
--- a/i18n/es/security.ts
+++ b/i18n/es/security.ts
@@ -65,48 +65,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">Cualquiera</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ninguna</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,164 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Fijar código</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Cambiar código</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Introducir código</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Código Incorrecto</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">El código introducido es incorrecto.
-Acceso denegado</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Cualquiera</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ninguna</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Teclee nuevo código</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Reintroduzca nuevo código</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Configuración de Seguridad</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Cambiar código</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Borrar código</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Solicitar código al encender</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Sincronizar</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Sincronización desde red:</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (predefinido)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Cualquiera</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ninguna</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Elegir un código proporciona un mínimo nivel de protección contra accesos ocasionales al dispositivo.</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Código</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Identificación</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">Identificación automática</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Sincronización desde red:</translation>
diff --git a/i18n/es/snake.ts b/i18n/es/snake.ts
index f40a6e2..d794b17 100644
--- a/i18n/es/snake.ts
+++ b/i18n/es/snake.ts
@@ -13,39 +13,31 @@
         <source>SNAKE!</source>
         <translation>SERPIENTE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Use el mando para guiar a la serpiente
 hacia los ratones. No debe chocar
 contra muros, orillas o su cola.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Pulse una tecla para empezar</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>   Puntuación:  %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>¡JUEGO TERMINADO!
 Puntuación: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Pulse una tecla para empezar de nuevo.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Pulse una tecla para empezar</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Pulse una tecla para comenzar un nuevo juego.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/es/sysinfo.ts b/i18n/es/sysinfo.ts
index fe4367f..0445959 100644
--- a/i18n/es/sysinfo.ts
+++ b/i18n/es/sysinfo.ts
@@ -142,40 +142,24 @@
         <source>Cached (%1 kB)</source>
         <translation>Cacheada (%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 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>Está página muestra cómo la memoria (es decir RAM) está siendo usada.
 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.
@@ -193,66 +177,52 @@ La memoria se cataloga como sigue:
         <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>
     </message>
     <message>
         <source>Used by</source>
         <translation>Usado por</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">¿Seguro que quiere ejecutar %1 para este módulo?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>¿Está seguro de que desea ejecutar
 %1 para este módulo?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
@@ -299,34 +269,24 @@ Mantenga pulsado un proceso para ver información adicional, o para enviarle una
         <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 type="obsolete">¿Seguro que quiere enviar %1 a este proceso?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>¿Está seguro de que sea enviar %1
 a este proceso?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Información del Sistema</translation>
     </message>
@@ -377,32 +337,24 @@ a este proceso?</translation>
         <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 type="obsolete">&lt;p&gt;Modelo: </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>&lt;br&gt;Modelo: </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Vendedor: </translation>
     </message>
     <message>
diff --git a/i18n/es/tableviewer.ts b/i18n/es/tableviewer.ts
index 308cd84..90db1d6 100644
--- a/i18n/es/tableviewer.ts
+++ b/i18n/es/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() No puedo dar un valor por omisión al tipo %1, Clave no añadida.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) No encontrado tipo válido</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Reiniciar</translation>
     </message>
     <message>
         <source>key</source>
         <translation>clave</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/es/textedit.ts b/i18n/es/textedit.ts
index af727be..a3fd461 100644
--- a/i18n/es/textedit.ts
+++ b/i18n/es/textedit.ts
@@ -145,30 +145,24 @@
         <source>Unnamed</source>
         <translation>Sin nombre</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permisos</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Elegir Letra</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">¿Seguro que quiere&lt;BR&gt;&lt;B&gt;borrar&lt;/B&gt; el fichero actual
-del disco?&lt;BR&gt;¡¡Es &lt;B&gt;irreversible&lt;/B&gt;!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sí</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit tiene copyright&lt;BR&gt;2000 Trolltech AS, y&lt;BR&gt;2002 &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;, y está bajo licencia GPL</translation>
     </message>
     <message>
diff --git a/i18n/es/tictac.ts b/i18n/es/tictac.ts
index c1ab3c0..9fb4dda 100644
--- a/i18n/es/tictac.ts
+++ b/i18n/es/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/es/today.ts b/i18n/es/today.ts
index 9ed5b37..b5172cd 100644
--- a/i18n/es/today.ts
+++ b/i18n/es/today.ts
@@ -5,28 +5,24 @@
         <source>Today</source>
         <translation type="unfinished">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 type="obsolete">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>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -59,72 +55,28 @@
         <source>Move Up</source>
         <translation>Mover arriba</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover abajo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activa/orden</translation>
     </message>
     <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">minutos inactivo</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Varios</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Marque aquí si HOY debe ser autoarrancado al arrancar.</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Cuantos minutos ha estado suspendidad la PDA antes que se active la opción de autoarranque</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Tamaño del icono</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Fijar el tamaño del icono en pixel</translation>
-    </message>
-    <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">¿Arrancar
-al encender?
-(sólo Opie)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Actualizar</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Con qué frecuencia debe Hoy actualizarse</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete"> seg</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">nunca</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>Pulse en las casillas para activar un módulo o use los botones de desplazamiento para cambiar el orden de aparición</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configuración de Hoy</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
diff --git a/i18n/es/todolist.ts b/i18n/es/todolist.ts
index 25c72f3..d5f986a 100644
--- a/i18n/es/todolist.ts
+++ b/i18n/es/todolist.ts
@@ -76,206 +76,118 @@
     <message>
         <source>Enter Task</source>
         <translation>Introducir Tarea</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>silenciosa</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>sonora</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Tareas Opie</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Nuevo desde plantilla</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nueva tarea</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Pulse aquí para crear una nueva tarea.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Editar Tarea</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Pulse aquí para modificar la tarea actual.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Ver tarea</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Eliminar...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Pulse aquí para borrar la tarea actual.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Borrar todo...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Borrado completado</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Emitir</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Pulse aquí para enviar la tarea actual a otro dispositivo.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Buscar</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Mostrar tareas completadas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostrar sólo tareas fuera de fecha</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostrar fecha límite</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostrar barra de tareas rápida</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Datos</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Categoría</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opciones</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>EditorRápido</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Este es un listado de todas las tareas actuales:
 
 La lista muestra la siguiente información:
 1. Completada - una marca verde indica tarea finalizada. Pulse aquí para completar una tarea.
 2. Prioridad - una representación gráfica de la prioridad de una tarea. Haga un click doble aquí para modificarla.
 3. Descripción - descripción de la tarea. Pulse aquí para seleccionar la tarea.
 4. Fecha límite - muestra cuando vence una tarea. Esta columna puede mostrarse o esconderse en las opciones del menú.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Todas</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Sin espacio</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tareas fue incapaz de
 salvar sus cambios.
 Libere algo de espacio
 e inténtelo de nuevo.
 
 ¿Salir de todas formas?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>Tareas</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation 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 type="obsolete">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 type="obsolete">Duplicar</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridad</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Descripción</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Fecha lí­mite</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
@@ -503,28 +415,24 @@ Le permite añadir rápidamente una nueva tarea a la lista. Esta área puede mos
         <source>Select category to organize this task with.</source>
         <translation>Seleccione la categoría con la que organizar esta tarea.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tarea repetitiva</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Pulse aquí si la tarea ocurre regularmente. Si lo selecciona, la frecuencia puede fijarse en la etiqueta Repetición.</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notas:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Introduzca aquí cualquier información adicional sobre esta tarea.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Lista de Tareas</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Sumario:</translation>
     </message>
 </context>
diff --git a/i18n/es/usermanager.ts b/i18n/es/usermanager.ts
index d121696..019e5e4 100644
--- a/i18n/es/usermanager.ts
+++ b/i18n/es/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>Añadir grupo</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Editar grupo</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">Gestor de Usuarios de Opie</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Gestor de Usuarios de Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Añadir usuario</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/es/zsafe.ts b/i18n/es/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/es/zsafe.ts
+++ b/i18n/es/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/fr/addressbook.ts b/i18n/fr/addressbook.ts
index f3fc7d2..0ce6a32 100644
--- a/i18n/fr/addressbook.ts
+++ b/i18n/fr/addressbook.ts
@@ -20,182 +20,96 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Non classée</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacts</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Contact</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nouveau</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editer</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Supprimer</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Rechercher</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Ecrire un e-mail à</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Transmettre entrée</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Informations personnelles</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vue</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Edition non autorisée,&lt;br&gt;
 synchronisation en cours</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editer informations personnelles</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Editer contact</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacts - Informations personnelles</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Mémoire saturée</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossible de sauvegarder&lt;br&gt;
 Libérez de la mémoire&lt;br&gt;
 et réessayez&lt;br&gt;
 &lt;br&gt;
 Quitter tout de même ?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Toutes</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Non classée</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importer vCard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Fermer recherche</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Enregistrer toutes les données</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Préférences</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Non trouvé</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Liste</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Fiches</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Fiche</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Démarrer recherche</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Type du fichier valide ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Oui</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Non</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="obsolete">Aucun contact ne correspond
-à cette expression !</translation>
-    </message>
-    <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Le fichier selectionné&lt;br&gt;
 ne se termine pas par &quot;.vcf&quot;.&lt;br&gt;
 Voulez-vous vraiment l&apos;ouvrir ?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Ajouter contact ?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Voulez-vous vraimment&lt;br&gt;
 ajouter un contact pour&lt;br&gt;
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Oui pour &amp;tous</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Exporter vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Vous devez sélectionner&lt;br&gt;
 un contact !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Vous devez entrer&lt;br&gt;
 un nom de fichier !</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Aucun contact trouvé !</translation>
@@ -1394,180 +1308,13 @@ founi gratuitement !</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Exporter vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Informations personnelles</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Tél (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Mobile (Bur.)</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Email par défaut</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Emails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Tél (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Mobile (Perso.)</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Service</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Profession</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistant(e)</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Responsable</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Epou(x|se)</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Type</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Date de Naissance</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Anniversaire</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Surnom</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Enfant(s)</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Titre</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Prénom</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">2nd Prénom</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffixe</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Lister sous</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Fonction</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Département</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Société</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Rue (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Ville (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Département (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Code Postal (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Pays (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Alphapage (Bur.)</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Page Web (Bur.)</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Rue (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Ville (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Département (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Code Postal (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Pays (Dom.)</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Page Web (Perso.)</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Note</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/advancedfm.ts b/i18n/fr/advancedfm.ts
index f4ba524..dbafc41 100644
--- a/i18n/fr/advancedfm.ts
+++ b/i18n/fr/advancedfm.ts
@@ -62,28 +62,24 @@
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renommer</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Ce répertoire n&apos;existe pas</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Copier sous</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Sortie écran</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Transmission</translation>
     </message>
     <message>
@@ -138,171 +134,80 @@
         <source>Copy </source>
         <translation>Copier</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Sous</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copier dans ce même répertoire</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Impossible de copier
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">vers</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Impossible de déplacer</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Ajouter dans Documents</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Actions</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Tout sélectioner</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Confirmer la suppression
-du fichier %1 ?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Supprimer le répertoire ?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Confirmer la copie
-du fichier %1 ?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Le fichier existe !</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-exite déjà. Confirmer l&apos;écrasement ?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">Existe déjà.
-Voulez-vous vraiment l&apos;effacer ?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 existe déjà.
-Confirmer son écrasement ?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Impossible de copier
-%1 vers %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Gestionnaire de fichier Explorateur
-Copyright 2002-2003
-L.J.Potter &lt;llornkcor@handhelds.org&gt;
-Sous licence GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Répertoire des favoris</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Effacer le répertoire courant des favoris</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Impossible d&apos;effacer le répertoire
-courant des favoris.
-Il ne fait pas partie des 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 type="obsolete">Voulez-vous réellement
-supprimer %1
-et tout son contenu ?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Confirmer suppression de
-%1 ?</translation>
-    </message>
-    <message>
         <source>AdvancedFm :: </source>
         <translation>Explorateur :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>Ko libres</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="obsolete">Impossible de copier
-%1
-vers
-%2</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/appearance.ts b/i18n/fr/appearance.ts
index ce9077c..c8f5d57 100644
--- a/i18n/fr/appearance.ts
+++ b/i18n/fr/appearance.ts
@@ -14,37 +14,24 @@
         <source>Edit...</source>
         <translation>Editer...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Enregister</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Forcer style pour toutes les applications.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Désactiver style pour les applications :
-(&lt;b&gt;*&lt;/b&gt; peut être utilisé comme joker):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Applications</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <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>
@@ -75,64 +62,44 @@
         <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 type="obsolete">Redémarrer</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Voulez-vous redémarrer %1 maintenant ?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Oui</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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é.
@@ -163,52 +130,24 @@ Cliquez ici pour sélectionner un thème.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Cliquez ici pour changer les couleurs dans le thème de couleur actuel.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Cliquez ici pour effacer le thème de couleur de la liste.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Cliquez ici pour définir un nom et sauvegarder le thème de couleur actuel.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Cliquez ici pour permettre à toutes les applications d&apos;utiliser les préférences globales d&apos;apparence.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Si des applications ne s&apos;affichent pas correctement suite aux choix d&apos;apparence globale, vous pouvez désactiver certaines des fonctionnalités pour celle-ci.
-
-Cette partie vous permet de sélectionner une application et de lui attribuer des préférences personnalisées.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Cliquez ici pour ajouter une application à la liste ci-dessous.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Cliquez ici pour effacer l&apos;application sélectionnée.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Cliquez ici pour remonter l&apos;application sélectionnée dans la liste.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Cliquez ici pour descendre l&apos;application sélectionnée dans la liste.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Cliquez ici pour sélectionner le style des fenêtres avec onglet (comme cette application). Les styles disponibles sont:
 
 1. Onglet - Onglets normaux avec des titres texte seulement
 2. Onglet avec icone - Onglets avec icone pour chaque onglet, les titres textes apparaissent seulement sur l&apos;onglet courant
 3. Liste déroulante - Une liste verticale des onglets
 4. Liste déroulante avec icone - Une liste verticale des onglets avec des icones</translation>
diff --git a/i18n/fr/aqpkg.ts b/i18n/fr/aqpkg.ts
index 1f73e7c..da2a0d6 100644
--- a/i18n/fr/aqpkg.ts
+++ b/i18n/fr/aqpkg.ts
@@ -1,34 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>CategoryFilterDlg</name>
-    <message>
-        <source>Category Filter</source>
-        <translation type="obsolete">Filtre par catégorie</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuler</translation>
-    </message>
-    <message>
-        <source>Select groups to show</source>
-        <translation type="obsolete">Sélectionner groupes à afficher</translation>
-    </message>
-</context>
-<context>
     <name>CategoryFilterImpl</name>
     <message>
         <source>Category Filter</source>
         <translation>Filtre par catégorie</translation>
     </message>
     <message>
         <source>Select one or more groups</source>
         <translation>Sélectionnez un ou plusieurs groupes</translation>
     </message>
 </context>
 <context>
     <name>DataManager</name>
@@ -40,51 +21,24 @@
 <context>
     <name>InputDialog</name>
     <message>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
 </context>
 <context>
-    <name>InstallDlg</name>
-    <message>
-        <source>Install</source>
-        <translation type="obsolete">Installer</translation>
-    </message>
-    <message>
-        <source>Start</source>
-        <translation type="obsolete">Démarrer</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Options</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="obsolete">Sortie</translation>
-    </message>
-    <message>
-        <source>Destination</source>
-        <translation type="obsolete">Destination</translation>
-    </message>
-    <message>
-        <source>Space Avail</source>
-        <translation type="obsolete">Espace dispo</translation>
-    </message>
-</context>
-<context>
     <name>InstallDlgImpl</name>
     <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
     <message>
         <source>Remove
 </source>
         <translation>Supprimer
 </translation>
     </message>
     <message>
@@ -153,55 +107,24 @@
         <translation>%1 Kb</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
         <source>Save output</source>
         <translation>Enregistrer la sortie</translation>
     </message>
 </context>
 <context>
-    <name>InstallOptionsDlg</name>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Options</translation>
-    </message>
-    <message>
-        <source>Force Depends</source>
-        <translation type="obsolete">Forcer les Dépendances</translation>
-    </message>
-    <message>
-        <source>Force Reinstall</source>
-        <translation type="obsolete">Forcer la Réinstallation</translation>
-    </message>
-    <message>
-        <source>Force Remove</source>
-        <translation type="obsolete">Forcer la Suppression</translation>
-    </message>
-    <message>
-        <source>Force Overwrite</source>
-        <translation type="obsolete">Forcer la Ré-écriture</translation>
-    </message>
-    <message>
-        <source>Verbose WGet</source>
-        <translation type="obsolete">WGet Verbeux</translation>
-    </message>
-    <message>
-        <source>OK</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-</context>
-<context>
     <name>InstallOptionsDlgImpl</name>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Force Depends</source>
         <translation>Forcer les dépendances</translation>
     </message>
     <message>
         <source>Force Reinstall</source>
         <translation>Forcer la réinstallation</translation>
@@ -275,56 +198,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Impossible d&apos;ouvrir le fichier de statut -</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Impossible de créer le fichier temporaire de statut -</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Impossible de démarrer le processus ipkg</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Ouverture impossible de : </translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Création du répertoire</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Lien %1 sur %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Erreur de création du lien de %1 vers %2</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Supprimé : %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Suppression impossible de : %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Supprimé</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Suppression impossible</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
@@ -448,44 +339,24 @@
         <source>View</source>
         <translation>Vue</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Configurer</translation>
     </message>
     <message>
         <source>Click here to configure this application.</source>
         <translation>Cliquez ici pour configurer l&apos;application.</translation>
     </message>
     <message>
-        <source>Help</source>
-        <translation type="obsolete">Aide</translation>
-    </message>
-    <message>
-        <source>Click here for help.</source>
-        <translation type="obsolete">Cliquez ici pour afficher l&apos;aide.</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">A Propos</translation>
-    </message>
-    <message>
-        <source>Click here for software version information.</source>
-        <translation type="obsolete">Cliquez ici pour les informations sur la version du logiciel.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Options</translation>
-    </message>
-    <message>
         <source>Click here to hide the find toolbar.</source>
         <translation>Cliquez ici pour fermer la barre de recherche.</translation>
     </message>
     <message>
         <source>Servers:</source>
         <translation>Serveurs : </translation>
     </message>
     <message>
         <source>Click here to select a package feed.</source>
         <translation>Cliquez ici pour sélectionner un serveur de paquets.</translation>
     </message>
     <message>
@@ -500,77 +371,45 @@ A blue dot next to the package name indicates that the package is currently inst
 A blue dot with a star indicates that a newer version of the package is available from the server feed.
 
 Click inside the box at the left to select a package.</source>
         <translation>Voici la liste de tous les paquets disponibles sur le serveur sélectionné.
 
 Un point bleu signifie que le paquet est déjà installé sur cet appareil.
 
 Un point bleu avec une étoile signifie que le paquet est déjà installé, mais que la version du serveur est plus récente.
 
 Cochez la case en début de ligne pour sélectionner un paquet.</translation>
     </message>
     <message>
-        <source>About AQPkg</source>
-        <translation type="obsolete">A propos de AQPkg</translation>
-    </message>
-    <message>
         <source>Remove</source>
         <translation>Enlever</translation>
     </message>
     <message>
         <source>Click here to uninstall the currently selected package(s).</source>
         <translation>Cliquez ici pour désinstaller le(s) paquet(s) sélectionné(s).</translation>
     </message>
     <message>
         <source>Building server list:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste du serveur :
 %1
 </translation>
     </message>
     <message>
         <source>Building package list for:
 <byte value="x9"/>%1</source>
         <translation>Construit la liste des paquets pour :
 %1</translation>
     </message>
     <message>
-        <source>Installed To - %1</source>
-        <translation type="obsolete">Installé sur - %1</translation>
-    </message>
-    <message>
-        <source>Description - %1</source>
-        <translation type="obsolete">Description - %1</translation>
-    </message>
-    <message>
-        <source>Size - %1</source>
-        <translation type="obsolete">Taille - %1</translation>
-    </message>
-    <message>
-        <source>Section - %1</source>
-        <translation type="obsolete">Section - %1</translation>
-    </message>
-    <message>
-        <source>Filename - %1</source>
-        <translation type="obsolete">Nom - %1</translation>
-    </message>
-    <message>
-        <source>V. Installed - %1</source>
-        <translation type="obsolete">V. Installée - %1</translation>
-    </message>
-    <message>
-        <source>V. Available - %1</source>
-        <translation type="obsolete">V. Disponible - %1</translation>
-    </message>
-    <message>
         <source>Refreshing server package lists</source>
         <translation>Rafraîchit la liste des paquets des serveurs</translation>
     </message>
     <message>
         <source>WARNING: Upgrading while
 Opie/Qtopia is running
 is NOT recommended!
 
 Are you sure?
 </source>
         <translation>ATTENTION : La mise à jour
 lorsque Opie/Qtopia fonctionne
@@ -638,42 +477,34 @@ Etes-vous sûr ?</translation>
         <translation>Voulez-vous enlever ou réinstaller
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Enlever ou réinstaller</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Réinstaller</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Voulez-vous enlever ou mettre à jour
 %1 ?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Enlever ou mettre à jour</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Mise à jour du bureau...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Description&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
@@ -750,107 +581,24 @@ Etes-vous sûr ?</translation>
         <source>Nothing after colon in version number.</source>
         <translation>N° de version terminé par &apos;:&apos; .</translation>
     </message>
 </context>
 <context>
     <name>QuestionDlg</name>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
 </context>
 <context>
-    <name>SettingsBase</name>
-    <message>
-        <source>Configuration</source>
-        <translation type="obsolete">Configuration</translation>
-    </message>
-    <message>
-        <source>Servers</source>
-        <translation type="obsolete">Serveurs</translation>
-    </message>
-    <message>
-        <source>Active Server</source>
-        <translation type="obsolete">Serveur actif</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom : </translation>
-    </message>
-    <message>
-        <source>URL:</source>
-        <translation type="obsolete">URL : </translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="obsolete">Changer</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Supprimer</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nouveau</translation>
-    </message>
-    <message>
-        <source>Destinations</source>
-        <translation type="obsolete">Destinations</translation>
-    </message>
-    <message>
-        <source>Link To Root</source>
-        <translation type="obsolete">Créer un lien vers root</translation>
-    </message>
-    <message>
-        <source>Proxies</source>
-        <translation type="obsolete">Proxies</translation>
-    </message>
-    <message>
-        <source>HTTP Proxy</source>
-        <translation type="obsolete">Proxy HTTP</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Mot de Passe</translation>
-    </message>
-    <message>
-        <source>Enabled</source>
-        <translation type="obsolete">Activé</translation>
-    </message>
-    <message>
-        <source>FTP Proxy</source>
-        <translation type="obsolete">Proxy FTP</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Utilisateur</translation>
-    </message>
-    <message>
-        <source>&amp;Apply</source>
-        <translation type="obsolete">&amp;Appliquer</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="obsolete">Général</translation>
-    </message>
-    <message>
-        <source>(Will take effect on restart)</source>
-        <translation type="obsolete">(Prendra effet après redémarrage)</translation>
-    </message>
-    <message>
-        <source>Show Jump To Letters</source>
-        <translation type="obsolete">Afficher la Navigation par Lettres</translation>
-    </message>
-</context>
-<context>
     <name>SettingsImpl</name>
     <message>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
         <source>Servers</source>
         <translation>Serveurs</translation>
     </message>
     <message>
         <source>Destinations</source>
         <translation>Destinations</translation>
diff --git a/i18n/fr/backup.ts b/i18n/fr/backup.ts
index 7f5fc68..1ea8c4e 100644
--- a/i18n/fr/backup.ts
+++ b/i18n/fr/backup.ts
@@ -1,21 +1,17 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Sauvegarde/Restauration... en cours...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Sauvegarde/Restauration</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Erreur système :
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Message</translation>
@@ -28,46 +24,38 @@
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Détails</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Sauvegarde/Restauration.. Echec !!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Sauvegarde Effectuée.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Veuillez sélectionner un élément
 à restaurer.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Echec de restauration.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Impossible d&apos;ouvrir fichier :
 %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Restauration effectuée.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation>Sauvegarde effectuée avec succès.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Restauration effectuée avec succès.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -101,52 +89,44 @@
         <source>Backup And Restore</source>
         <translation>Sauvegarde/Restauration</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Sauvegarde</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applications</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Enregistrer sous</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Sauvegarder</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restauration</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Sélectionner une source</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Colonne 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restaurer</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Rafraichir la liste des fichiers</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/calculator.ts b/i18n/fr/calculator.ts
index c3edc0b..686cc4b 100644
--- a/i18n/fr/calculator.ts
+++ b/i18n/fr/calculator.ts
@@ -1,21 +1,17 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Calculatrice expérimentale</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -121,28 +117,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculatrice</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/fr/calibrate.ts b/i18n/fr/calibrate.ts
index 98acd69..de9aeda 100644
--- a/i18n/fr/calibrate.ts
+++ b/i18n/fr/calibrate.ts
@@ -1,16 +1,12 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez sur la croix fermement et 
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Bienvenue sur Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/fr/checkbook.ts b/i18n/fr/checkbook.ts
index 278736e..4307941 100644
--- a/i18n/fr/checkbook.ts
+++ b/i18n/fr/checkbook.ts
@@ -30,48 +30,24 @@
         <source>Enter name of checkbook here.</source>
         <translation>Entrez ici le nom du livre de comptes.</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 type="obsolete">Epargne</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Compte chèque</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Liquidités</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Fond de pension</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -94,32 +70,24 @@
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Entrez ici le solde initial pour ce livre de comptes .</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 comptes ici.</translation>
     </message>
     <message>
-        <source>Current balance: %10.00</source>
-        <translation type="obsolete">Solde actuel: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>Voici la liste de toutes les transactions entrées pour ce livre de comptes.
 
 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>
@@ -174,28 +142,24 @@ Pour trier la liste par rapport à un champ spécifique, cliquez sur le nom de l
         <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 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 comptes par mot de passe.</translation>
     </message>
     <message>
@@ -648,109 +612,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Véhicule</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Factures</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CDs</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Vêtements</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Ordinateur</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVDs</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Electronique</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Loisirs</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Alimentation</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Carburant</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Divers</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Cinéma</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Location</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <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 type="obsolete">Professionnel</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Personnel</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <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 type="obsolete">Electroniques</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/fr/clock.ts b/i18n/fr/clock.ts
index d6430fe..7bf5450 100644
--- a/i18n/fr/clock.ts
+++ b/i18n/fr/clock.ts
@@ -32,76 +32,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">En sommeil</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Horloge</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Chrono</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Démarrer</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Remise à zéro</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Définir alarme</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Arrêter</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">Après-midi</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarme activée</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarme désactivée</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Paramètrer date et heure.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Horloge: alarme manquée.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarme fixée : %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -235,54 +195,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Définir alarme</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Heure</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minute</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Délai avant
-sonnerie (mn)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">Alarme mp3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tout</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/datebook.ts b/i18n/fr/datebook.ts
index c0e23f4..cea184c 100644
--- a/i18n/fr/datebook.ts
+++ b/i18n/fr/datebook.ts
@@ -336,24 +336,32 @@ dans : </translation>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -406,59 +414,24 @@ dans : </translation>
     <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>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">S</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Agenda</translation>
     </message>
     <message>
         <source>Repeat...</source>
@@ -580,29 +553,24 @@ horaire
     <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 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>
diff --git a/i18n/fr/doctab.ts b/i18n/fr/doctab.ts
index 866734a..d66b7c4 100644
--- a/i18n/fr/doctab.ts
+++ b/i18n/fr/doctab.ts
@@ -1,31 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>DocTabSettingsBase</name>
     <message>
         <source>DocTab Settings</source>
         <translation>Paramètres de l&apos;onglet Documents</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="obsolete">&lt;b&gt;Voulez-vous avoir l&apos;onglet Documents?&lt;/b&gt;&lt;p&gt;
-Le système recherche &lt;i&gt;tous&lt;/i&gt; les documents sur
-&lt;i&gt;tous&lt;/i&gt; les supports externes, de façon à remplir
-Documents (ce qui peut être vraiment très long...)</translation>
-    </message>
-    <message>
         <source>Enable the DocTab</source>
         <translation>Activer l&apos;onglet Documents</translation>
     </message>
     <message>
         <source>Yes, please!</source>
         <translation>Oui !</translation>
     </message>
     <message>
         <source>No, thanks.</source>
         <translation>Non.</translation>
     </message>
     <message>
diff --git a/i18n/fr/embeddedkonsole.ts b/i18n/fr/embeddedkonsole.ts
index af701a6..af82d72 100644
--- a/i18n/fr/embeddedkonsole.ts
+++ b/i18n/fr/embeddedkonsole.ts
@@ -20,44 +20,24 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Autres commandes suggérées&lt;/B&gt; : </translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Konsole</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Petite</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">Police</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Options</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Entrer</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espace</translation>
     </message>
     <message>
@@ -76,52 +56,36 @@
         <source>Paste</source>
         <translation>Coller</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Afficher liste</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Cacher liste</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Onglets en dessous</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Vert sur noir</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Noir sur blanc</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Blanc sur noir</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Noir sur transparent</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Noir sur rouge</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rouge sur noir</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Vert sur jaune</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Bleu sur magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta sur bleu</translation>
     </message>
     <message>
@@ -140,28 +104,24 @@
         <source>Amber on Black</source>
         <translation>Ambre sur noir</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Couleurs</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Liste éditable</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Modifier liste</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Gauche</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Droite</translation>
     </message>
     <message>
@@ -184,28 +144,24 @@
         <source>Command List</source>
         <translation>Liste commandes</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Retour</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Avertissement sonore</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Onglets au dessus</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/fifteen.ts b/i18n/fr/fifteen.ts
index c11aaf0..d87a518 100644
--- a/i18n/fr/fifteen.ts
+++ b/i18n/fr/fifteen.ts
@@ -52,28 +52,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Mélanger</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Résoudre</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Jeu</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Pièces</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/formatter.ts b/i18n/fr/formatter.ts
index 680d440..a6b2b06 100644
--- a/i18n/fr/formatter.ts
+++ b/i18n/fr/formatter.ts
@@ -14,76 +14,50 @@
         <source>File Systems</source>
         <translation>Système de fichiers</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Option principales</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">ATTENTION:
-Changer des paramètres sur cette
-page peut rendre votre système
-instable!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Modifier /etc/fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Vérifier le disque</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Périphérique</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Point de montage</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Options avancées</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Format?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Vraiment formater
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-avec</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">système de fichier?!?
-Vous allez perdre toutes vos données!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Impossible de formater.
 Type inconnu</translation>
@@ -120,50 +94,36 @@ Périphérique occupé !</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Aucun périphérique de ce type !</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 a été formaté correctement.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Tentative de montage.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Echec du montage de la carte !</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-a réussi a être monté. </translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Vous pouvez maintenant fermer la fenêtre de sortie.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Interne</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Type de Support : </translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Total : %1 ko ( %d mo)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Utilisé : %1 ko ( %d Mo)
 </translation>
     </message>
     <message>
diff --git a/i18n/fr/go.ts b/i18n/fr/go.ts
index d80caee..2486a30 100644
--- a/i18n/fr/go.ts
+++ b/i18n/fr/go.ts
@@ -40,18 +40,14 @@
     <message>
         <source>A draw.</source>
         <translation>Un coup.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Je passe</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisonniers : noir %1, blanc %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Go</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/fr/helpbrowser.ts b/i18n/fr/helpbrowser.ts
index 2bad4be..679fb3a 100644
--- a/i18n/fr/helpbrowser.ts
+++ b/i18n/fr/helpbrowser.ts
@@ -22,21 +22,17 @@
         <source>Remove from Bookmarks</source>
         <translation>Effacer des favoris</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Favoris</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Aide en ligne</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation type="obsolete">Aide HTML</translation>
-    </message>
-    <message>
         <source>Go</source>
         <translation>Go</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/kbill.ts b/i18n/fr/kbill.ts
index 3f490d1..9546dcf 100644
--- a/i18n/fr/kbill.ts
+++ b/i18n/fr/kbill.ts
@@ -26,29 +26,24 @@
         <source>&amp;File</source>
         <translation>&amp;Fichier</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;L&apos;histoire&lt;/b&gt;&lt;p&gt;Encore une fois, le destin du monde se retrouve entre vos mains ! Un méchant hacker, connu seulement sous le pseudo &quot;Bill&quot;, a créé l&apos;ultime virus pour ordinateur. Un virus si puissant qu&apos;il transforme un ordinateur ordinaire en un simple grille-pain (oooh !). &quot;Bill&quot; a su se cloner lui même (en plusieurs milliards de micro Bills). Le but unique de ce célérat est aujourd&apos;hui de livrer ce virus partout en le faisant passer habilement pour un système d&apos;exploitation populaire. Au commande de votre interface &quot;Exterminator&quot;, vous devrez agir pour maintenir votre système réseau sain et sauf. Bonne chance !!!&lt;/p&gt;.
-</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>L&apos;histoire de kBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Les règles kBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;B&gt;La règle du jeu&lt;/B&gt;
 &lt;P&gt;kBill a été conçu pour être un jeu facile d&apos;accès pour tout le monde. Les années - non - les jours des essais du logiciels ont été supervisés par les meilleurs créateurs d&apos;interfaces homme/machine. Les conséquences sont là, même si l&apos;interface ne ressemble pas à celle de Macintosh. Quoi qu&apos;il en soit, il vous faudra&lt;/P&gt;
 &lt;LI&gt;Attraper les &quot;Bill&quot; (cliquer)&lt;/LI&gt;
diff --git a/i18n/fr/keypebble.ts b/i18n/fr/keypebble.ts
index 3d76c36..61c629b 100644
--- a/i18n/fr/keypebble.ts
+++ b/i18n/fr/keypebble.ts
@@ -21,28 +21,24 @@ connection.</source>
         <translation>Erreur de lecure : QSocket a renvoyé une erreur
 de lecture, l&apos;hôte distant a probablement clos la
 connection.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket a renvoyé un code d&apos;erreur invalide</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Attente de l&apos;initialisation du serveur...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>En attente du nom de poste...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Connecté à %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Erreur de protocole : le message Id %1 a été reçu à la place du message attendu de mise à jour.</translation>
     </message>
     <message>
diff --git a/i18n/fr/kpacman.ts b/i18n/fr/kpacman.ts
index cdfd70c..d27d2a3 100644
--- a/i18n/fr/kpacman.ts
+++ b/i18n/fr/kpacman.ts
@@ -86,34 +86,24 @@ Le programme est basé sur les sources de ksnake
 de Michel Filippi (mfilippi@sade.rhein-main.de).
 Le design est grandement influencé par pacman
 (c) 1980 MIDWAY MFG.CO.
 
 J&apos;aimerais remercier ma copine Elke Krueers pour
 ses 10 années d&apos;amitié.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="obsolete">Erreur de configuration</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="obsolete">Aucun thème n&apos;est défini,
-ou aucun thème n&apos;est sélectionné.</translation>
-    </message>
-    <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Le &quot;bitfont&quot; ne peut pas être construit.
diff --git a/i18n/fr/launchersettings.ts b/i18n/fr/launchersettings.ts
index 7a8c9d0..c5b4903 100644
--- a/i18n/fr/launchersettings.ts
+++ b/i18n/fr/launchersettings.ts
@@ -79,63 +79,44 @@
         <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="obsolete">Show Applications in subpopups (**)</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>
@@ -223,52 +204,44 @@
         <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 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 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>
diff --git a/i18n/fr/libbatteryapplet.ts b/i18n/fr/libbatteryapplet.ts
index 1bcacc3..ec99565 100644
--- a/i18n/fr/libbatteryapplet.ts
+++ b/i18n/fr/libbatteryapplet.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>En charge</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Pourcentage de batterie chargé </translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Niveau batterie : </translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bon</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Faible</translation>
     </message>
     <message>
@@ -38,68 +34,44 @@
         <source>On backup power</source>
         <translation>Sur batterie</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Adaptateur secteur connecté</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Adaptateur secteur déconnecté</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Durée de batterie restante </translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Fermer</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Niveau de la batterie</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Echec</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>le fichier ne peut pas être ouvert</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Chargement des deux dispositifs</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Pourcentage de batterie chargé : </translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Temps restant de la batterie : </translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Aucune module avec batterie</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>Aucune donné</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">iPaq </translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Jaquette </translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/libliquid.ts b/i18n/fr/libliquid.ts
index 9197a32..f9acc6d 100644
--- a/i18n/fr/libliquid.ts
+++ b/i18n/fr/libliquid.ts
@@ -1,76 +1,69 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">Liquide</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">Thème liquide</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Pas de transparence</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Pointillé, couleur de fond</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Pointillé, couleur de bouton</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Pointillé translucide, couleur de fond</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Pointillé translucide, couleur de bouton</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Personalisation de la transparence</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Couleur des menus</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Couleur du texte</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Opacité</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Utiliser des menus ombrés</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Rendre unis les buttons de la barre des outils</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Contraste pointillé</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquide</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Thème liquide haute performance par Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libmemoryapplet.ts b/i18n/fr/libmemoryapplet.ts
index 65a2ff8..bdedbe8 100644
--- a/i18n/fr/libmemoryapplet.ts
+++ b/i18n/fr/libmemoryapplet.ts
@@ -114,28 +114,24 @@ La mémoire (i.e RAM) est divisée en catégories comme suit :
         <source>Manage Swapfile</source>
         <translation>Gérer fichier d&apos;échange</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Générer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="obsolete">2 Mb, 4 Mb, 6 Mb, 8 Mb</translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation>Echec lors de la détachement du fichier d&apos;échange.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Fichier d&apos;échange désactivé.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Echec de création du fichier d&apos;échange.</translation>
     </message>
     <message>
diff --git a/i18n/fr/libopiecore2.ts b/i18n/fr/libopiecore2.ts
index f4adb67..bf40af2 100644
--- a/i18n/fr/libopiecore2.ts
+++ b/i18n/fr/libopiecore2.ts
@@ -49,28 +49,24 @@
         <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>Display Rotate</source>
-        <translation type="obsolete">Rotation écran</translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation>Bouton Action</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Bouton OK</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Bouton Fin</translation>
     </message>
     <message>
diff --git a/i18n/fr/libopieobex.ts b/i18n/fr/libopieobex.ts
index e727917..0320861 100644
--- a/i18n/fr/libopieobex.ts
+++ b/i18n/fr/libopieobex.ts
@@ -1,63 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="obsolete">Envoie OBEX</translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="obsolete">Envoie : </translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="obsolete">Nom de fichier</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuler</translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="obsolete">Réception OBEX</translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="obsolete">TextLabel1</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="obsolete">Nom de fichier</translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="obsolete">Vous avez recu un
-fichier.</translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="obsolete">Accepter</translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="obsolete">Refuser</translation>
-    </message>
-</context>
-<context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;b&gt;Recevoir :&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation>Accepter</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation>Refuser</translation>
@@ -113,87 +65,13 @@ fichier.</translation>
         <source>Try %1</source>
         <translation>Essayer %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Recherche IrDa à nouveau.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Début de l&apos;envoi</translation>
     </message>
 </context>
-<context>
-    <name>OtherHandler</name>
-    <message>
-        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Recevoir :&lt;/b&gt;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="obsolete">Accepter</translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="obsolete">Refuser</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation type="obsolete">&lt;p&gt;Vous avez reçu un fichier du type %1 (&lt;img src=&quot;%2&quot;&gt; )Que voulez-vous faire ?</translation>
-    </message>
-</context>
-<context>
-    <name>SendWidget</name>
-    <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Envoie :&lt;/h1&gt;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="obsolete">Terminé</translation>
-    </message>
-    <message>
-        <source>IrDa is not enabled!</source>
-        <translation type="obsolete">IrDa non activé !</translation>
-    </message>
-    <message>
-        <source>Searching for IrDa Devices.</source>
-        <translation type="obsolete">Recherche des Dispositifs IrDa.</translation>
-    </message>
-    <message>
-        <source>Bluetooth is not available</source>
-        <translation type="obsolete">Bluetooth n&apos;est pas disponible</translation>
-    </message>
-    <message>
-        <source>Searching for bluetooth Devices.</source>
-        <translation type="obsolete">Recherche des Dispositifs Bluetooth.</translation>
-    </message>
-    <message>
-        <source>Scheduling for beam.</source>
-        <translation type="obsolete">Préparation de l&apos;envoie.</translation>
-    </message>
-    <message>
-        <source>Click to beam</source>
-        <translation type="obsolete">Cliquez pour envoyer</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <translation type="obsolete">Envoyé</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="obsolete">Echéc</translation>
-    </message>
-    <message>
-        <source>Try %1</source>
-        <translation type="obsolete">Essayer %1</translation>
-    </message>
-    <message>
-        <source>Search again for IrDa.</source>
-        <translation type="obsolete">Recherche IrDa à nouveau.</translation>
-    </message>
-    <message>
-        <source>Start sending</source>
-        <translation type="obsolete">Début de l&apos;envoie</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libopiepim2.ts b/i18n/fr/libopiepim2.ts
index d3c0e4d..cfd5ae7 100644
--- a/i18n/fr/libopiepim2.ts
+++ b/i18n/fr/libopiepim2.ts
@@ -1,177 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Bouton Agenda</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Bouton Contacts</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Bouton Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Bouton E-mail</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Bouton Bureau</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Bouton Enregistrement</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotation écran</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Haut</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Bas</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Droite</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Gauche</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Maj-Haut</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Maj-Bas</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Maj-Droite</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Maj-Gauche</translation>
-    </message>
-    <message>
-        <source>Action Button</source>
-        <translation type="obsolete">Bouton Action</translation>
-    </message>
-    <message>
-        <source>OK Button</source>
-        <translation type="obsolete">Bouton OK</translation>
-    </message>
-    <message>
-        <source>End Button</source>
-        <translation type="obsolete">Bouton Fin</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Nuance:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat : </translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val : </translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rouge : </translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Vert : </translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Bleu : </translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal alpha : </translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Sélectionner couleur</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Ajouter</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Ajouter...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom : </translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Type mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Petite</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Répétition</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Jour</translation>
@@ -370,259 +208,24 @@ et </translation>
         <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>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Répétition</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Aucune</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Jour</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semaine</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mois</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Année</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Chaque : </translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Fréquence</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Fin : </translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sans</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Répéter</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lu</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Me</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Je</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ve</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Chaque </translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">A l&apos;infini</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">jours</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">jour</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semaines</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semaine</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">mois</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mois</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">années</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">année</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete"> et </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-et </translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, et </translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">Les </translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Pas de répétition</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">jour(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Répéter</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lu</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Me</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Je</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ve</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semaine(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Type répétition</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Jour</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mois</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">année(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Chaque </translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Heure : </translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Choisir heure : </translation>
-    </message>
-    <message>
-        <source>OTimePickerDialogBase</source>
-        <translation type="obsolete">OTimePickerDialogBase</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -676,68 +279,26 @@ et </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Sélection fichier</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Ouvrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Enregistrer</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Style</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documents</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Fichiers</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">Tous 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>
@@ -764,56 +325,48 @@ et </translation>
         <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 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>Alphapage (bur.):</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <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>
diff --git a/i18n/fr/libopieui2.ts b/i18n/fr/libopieui2.ts
index e43f2a2..19ffe11 100644
--- a/i18n/fr/libopieui2.ts
+++ b/i18n/fr/libopieui2.ts
@@ -1,490 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Bouton Agenda</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Bouton Contacts</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Bouton Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Bouton E-mail</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Bouton Bureau</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Bouton Enregistrement</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotation écran</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Haut</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Bas</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Droite</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Gauche</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Maj-Haut</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Maj-Bas</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Maj-Droite</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Maj-Gauche</translation>
-    </message>
-    <message>
-        <source>Action Button</source>
-        <translation type="obsolete">Bouton Action</translation>
-    </message>
-    <message>
-        <source>OK Button</source>
-        <translation type="obsolete">Bouton OK</translation>
-    </message>
-    <message>
-        <source>End Button</source>
-        <translation type="obsolete">Bouton Fin</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Nuance:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat : </translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val : </translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rouge : </translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Vert : </translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Bleu : </translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal alpha : </translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Sélectionner couleur</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Ajouter</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Ajouter...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Sélection fichier</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Ouvrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Enregistrer</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom : </translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Type mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Petite</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Style</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Le renard brun saute au dessus du chien paresseux</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyChooserConfigDialog</name>
-    <message>
-        <source>Configure Key</source>
-        <translation type="obsolete">Configurer clé</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Pixmap</source>
-        <translation type="obsolete">Dessin</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Key</source>
-        <translation type="obsolete">Touche</translation>
-    </message>
-    <message>
-        <source>Default Key</source>
-        <translation type="obsolete">Touche par défaut</translation>
-    </message>
-    <message>
-        <source>Shortcut for Selected Action</source>
-        <translation type="obsolete">Raccourci pour l&apos;action séléctionnée</translation>
-    </message>
-    <message>
-        <source>&amp;None</source>
-        <translation type="obsolete">&amp;Aucun</translation>
-    </message>
-    <message>
-        <source>&amp;Default</source>
-        <translation type="obsolete">&amp;Défaut</translation>
-    </message>
-    <message>
-        <source>C&amp;ustom</source>
-        <translation type="obsolete">&amp;Personnalisé</translation>
-    </message>
-    <message>
-        <source>Configure Key</source>
-        <translation type="obsolete">Configurer touche</translation>
-    </message>
-    <message>
-        <source>Default: </source>
-        <translation type="obsolete">Défaut : </translation>
-    </message>
-    <message>
-        <source>Key is on BlackList</source>
-        <translation type="obsolete">La touche est dans la liste noire</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;La touche que vous avez sélectionnée est dans la liste noire et ne devrait pas être utilisée avec ce gestionnaire. Veuillez utiliser une touche différente.&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Key is already assigned</source>
-        <translation type="obsolete">Touche déjà assignée</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;La touche que vous avez sélectionnée est déjà utilisée pour un autre élément de votre configuration. Veuillez utiliser une autre touche.&lt;/qt&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Répétition</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Aucune</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Jour</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semaine</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mois</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Année</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Chaque : </translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Fréquence</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Fin : </translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sans</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Répéter</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lu</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Me</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Je</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ve</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Chaque </translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">A l&apos;infini</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">jours</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">jour</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semaines</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semaine</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">mois</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mois</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">années</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">année</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete"> et </translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-et </translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, et </translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">Les </translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Pas de répétition</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">jour(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Répéter</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lu</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Me</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Je</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ve</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sa</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semaine(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Type répétition</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Jour</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mois</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">année(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">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>
@@ -613,475 +138,39 @@ et </translation>
         <translation type="unfinished">&lt;qt&gt;La touche que vous avez sélectionnée est dans la liste noire et ne devrait pas être utilisée avec ce gestionnaire. Veuillez utiliser une touche différente.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished">Touche déjà assignée</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;La touche que vous avez sélectionnée est déjà utilisée pour un autre élément de votre configuration. Veuillez utiliser une autre touche.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Taille</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Type mime</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 fichiers</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notes : </translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Priorité : </translation>
-    </message>
-    <message>
-        <source>Very high</source>
-        <translation type="obsolete">Très haute</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Haute</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normale</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Faible</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Très faible</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Etat : </translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Délai : </translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Catégorie : </translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">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 type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Adresse (bur):&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Service : </translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Page Web (bur.):</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Tél (bur.):</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Fax (bur.):</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Mobile (bur.):</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Alphapage (bur.):</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <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 type="obsolete">Page Web (bur.):</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Téléphone (dom.):</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Fax (dom.):</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Mobile (perso.):</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">E-mail(s) : </translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Profession : </translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistant(e) : </translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Responsable : </translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Homme</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Femme</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Type : </translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Conjoint : </translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Date de naissance : </translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Anniversaire : </translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Enfant(s) : </translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Surnom : </translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Lieu : </translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Cet événement couvre
-toute la journée</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Cet événement couvre
-plusieurs jours</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Début : </translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Fin : </translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Note : </translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Chaque </translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 chaque</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">Le %1 chaque</translation>
-    </message>
-    <message>
-        <source>The %1 %2 of every</source>
-        <translation type="obsolete">Le %2 %1 chaque </translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Chaque</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lundi</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Mardi</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Mercredi</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Jeudi</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Vendredi</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Samedi</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Dimanche</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">Description : </translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresse (bur.): &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adresse (dom.): &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>User Id</source>
-        <translation type="obsolete">Id utilisateur</translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="obsolete">Catégories</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Titre</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Prénom</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">2nd Prénom</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffixe</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Classer sous</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Fonction</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Département</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Société</translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Téléphone (bur.)</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax (bur.)</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Mobile (bur.)</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">E-mail (défaut)</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">E-mails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Téléphone (dom.)</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax (dom.)</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Mobile (perso.)</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Adresse (bur.)</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Ville (bur.)</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Département (bur.)</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Code Postal (bur.)</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Pays (bur.)</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Alphapage (bur.)</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Page Web (bur.)</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Bureau</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Profession</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistant(e)</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Responsable</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Adresse (dom.)</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Ville (dom.)</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Département (dom.)</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Code Postal (dom.)</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Pays (dom.)</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Page Web (perso.)</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Conjoint</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Sexe</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Date de naissance</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Anniversaire</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Surnom</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Enfant</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notes</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Aucune</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">,</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">,</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">,</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">,</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libqpe.ts b/i18n/fr/libqpe.ts
index 016ac23..0b7d078 100644
--- a/i18n/fr/libqpe.ts
+++ b/i18n/fr/libqpe.ts
@@ -190,28 +190,24 @@ de cette liste</translation>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>La chaîne n&apos;a pas été trouvée.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Fin atteinte, reprise au début</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation>Fin atteinte, redémarrage au %1</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Rechercher</translation>
     </message>
     <message>
@@ -450,62 +446,48 @@ before entering data</source>
         <translation>Impossible de créer les fichiers
 de départ. Veuillez libérer de la
 mémoire avant d&apos;entrer des
 données</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Programmation alarme impossible.
 Libérez de la mémoire et réessayez.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">J</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>jour</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mois</translation>
     </message>
     <message>
         <source>year</source>
         <translation>année</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Etes-vous sûr de vouloir effacer
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Tout</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Non classée</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adresse (bur.)&lt;/b&gt;</translation>
     </message>
     <message>
@@ -836,125 +818,74 @@ Libérez de la mémoire et réessayez.</translation>
         <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 type="obsolete">Cliquez pour fermer cette fenêtre et abandonner les modifications.</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 modifications.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Cliquez pour rendre cette fenêtre déplaçable.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;L&apos;aide globale n&apos;est pas disponible pour cette application, cependant, il existe une aide contectuelle.&lt;p&gt;Pour utiliser l&apos;aide contectuelle:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Cliquez et maintenez la pression sur le bouton d&apos;aide.&lt;li&gt;Lorsque la barre de titre affiche &lt;b&gt;qu&apos;est-ce-que c&apos;est...&lt;/b&gt;, cliquez sur n&apos;importe quel élément.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Qu&apos;est ce que...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Voulez-vous vraiment supprimer
 %1 ?&lt;/qt&gt;</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Erreur</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="obsolete">L&apos;application n&apos;a pas été trouvée</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="obsolete">L&apos;application n&apos;a pas été lancée</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation>J</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation>M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></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>Cliquez pour fermer cette fenêtre et abandonner les changements.</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 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>Cliquez pour que cette fenêtre remplisse l&apos;écran.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation>Cliquez pour que cette fenêtre soit déplaçable.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restaurer</translation>
     </message>
     <message>
diff --git a/i18n/fr/libtodayaddressbookplugin.ts b/i18n/fr/libtodayaddressbookplugin.ts
index e69b102..43596a7 100644
--- a/i18n/fr/libtodayaddressbookplugin.ts
+++ b/i18n/fr/libtodayaddressbookplugin.ts
@@ -2,44 +2,32 @@
 <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 type="obsolete">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 type="obsolete">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>
-    </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>
diff --git a/i18n/fr/libtodaydatebookplugin.ts b/i18n/fr/libtodaydatebookplugin.ts
index 3500627..03905c5 100644
--- a/i18n/fr/libtodaydatebookplugin.ts
+++ b/i18n/fr/libtodaydatebookplugin.ts
@@ -7,82 +7,24 @@
         <translation>[avec alarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>note</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Toute la journée</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Montrer le lieu</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Pour afficher le lieu de chaque évènement</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Montrer les notes</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Pour afficher les notes liées aux évènements</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Ne montrer que les
-évènements futurs</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Pour n&apos;afficher que les évènements à venir</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Nombre 
-d&apos;évènements 
-à afficher</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Nombre maximum d&apos;évènements à afficher (par ordre chronologique)</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Nombre de jours</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Nombre de jours prochains pour lesquels afficher les évènements</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">jour(s)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">aujourd&apos;hui</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Afficher le lieu</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Pour afficher le lieu de chaque évènement</translation>
diff --git a/i18n/fr/libtodaytodolistplugin.ts b/i18n/fr/libtodaytodolistplugin.ts
index ebd0b5f..559bdc8 100644
--- a/i18n/fr/libtodaytodolistplugin.ts
+++ b/i18n/fr/libtodaytodolistplugin.ts
@@ -29,33 +29,13 @@
         <source>tasks shown</source>
         <translation>tâches affichées</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Définit le nombre de caractères à afficher par ligne pour chaque tâche</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Nombre de caractères par ligne</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">Tâches affichées</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Définit le nombre maximum de tâches à afficher</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Nombre de caractères
-par ligne</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Définit le nombre de caractères à afficher par ligne pour chaque tâche</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/libtodayweatherplugin.ts b/i18n/fr/libtodayweatherplugin.ts
index c3b37c0..0f35d74 100644
--- a/i18n/fr/libtodayweatherplugin.ts
+++ b/i18n/fr/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Pres: </source>
         <source>SE </source>
         <translation>SE</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>KPH</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>MPH</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/libwlan.ts b/i18n/fr/libwlan.ts
index b8a2e63..b0fd6cf 100644
--- a/i18n/fr/libwlan.ts
+++ b/i18n/fr/libwlan.ts
@@ -1,309 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">Conf. liaison sans Fil</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Général</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation type="obsolete">Mode</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation type="obsolete">ESS-ID</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">Spécifier point d&apos;&amp;accès</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Channel</source>
-        <translation type="obsolete">Spécifier &amp;canal</translation>
+        <translation type="unfinished">Général</translation>
     </message>
     <message>
         <source>any</source>
-        <translation type="obsolete">any</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="obsolete">Infrastructure</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="obsolete">Auto</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation type="obsolete">Managed</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation type="obsolete">Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation type="obsolete">Sécurité</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">&amp;Activer le cryptage</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation type="obsolete">Configurer &amp;clé</translation>
-    </message>
-    <message>
-        <source>Key &amp;1</source>
-        <translation type="obsolete">Clé &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation type="obsolete">Clé &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="obsolete">Clé &amp;3</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation type="obsolete">Clé &amp;4</translation>
-    </message>
-    <message>
-        <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Paquets non-cryptés</translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Accepter</translation>
-    </message>
-    <message>
-        <source>&amp;Reject</source>
-        <translation type="obsolete">&amp;Rejeter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation type="obsolete">SSID</translation>
-    </message>
-    <message>
-        <source>Rescan Neighbourhood</source>
-        <translation type="obsolete">Rescanner</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation type="obsolete">Canal</translation>
+        <translation type="unfinished">SSID</translation>
     </message>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>General</source>
-        <translation type="unfinished">Général</translation>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished">Ad-Hoc</translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished">Mode</translation>
     </message>
     <message>
-        <source>ESS-ID</source>
-        <translation type="unfinished">ESS-ID</translation>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished">MAC</translation>
     </message>
     <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="unfinished">Canal</translation>
+    </message>
+    <message>
         <source>Encryption</source>
         <translation type="unfinished">Sécurité</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished">&amp;Activer le cryptage</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished">Configurer &amp;clé</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished">Clé &amp;1</translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished">Clé &amp;4</translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished">Clé &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished">Clé &amp;3</translation>
     </message>
     <message>
-        <source>AP</source>
-        <translation type="unfinished">AP</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation type="unfinished">Vitesse</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation type="unfinished">Station</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished">ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation type="unfinished">Bruit</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished">Qualité</translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation type="unfinished">Signal</translation>
-    </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished">SSID</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation type="unfinished">Canal</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link Quality</source>
-        <translation type="unfinished"></translation>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Clé &amp;4</translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Information interface</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">Canal</translation>
+        <translation type="unfinished">Canal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Mode</translation>
+        <translation type="unfinished">Mode</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Station</translation>
+        <translation type="unfinished">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">AP</translation>
+        <translation type="unfinished">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Vitesse</translation>
+        <translation type="unfinished">Vitesse</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Qualité</translation>
+        <translation type="unfinished">Qualité</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Bruit</translation>
+        <translation type="unfinished">Bruit</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Signal</translation>
+        <translation type="unfinished">Signal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/mediummount.ts b/i18n/fr/mediummount.ts
index 5c7c654..3d18970 100644
--- a/i18n/fr/mediummount.ts
+++ b/i18n/fr/mediummount.ts
@@ -1,65 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MainWindow</name>
-    <message>
-        <source>Global</source>
-        <translation type="obsolete">Global</translation>
-    </message>
-    <message>
-        <source>Medium Mount Settings</source>
-        <translation type="obsolete">Options Montage Support</translation>
-    </message>
-</context>
-<context>
-    <name>MediumGlobalWidget</name>
-    <message>
-        <source>Enable medium checking</source>
-        <translation type="obsolete">Autoriser Vérification Support</translation>
-    </message>
-    <message>
-        <source>Use global settings</source>
-        <translation type="obsolete">Utiliser les Options Globales</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Quel type de fichiers</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tous</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Image</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Texte</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Vidéo</translation>
-    </message>
-    <message>
-        <source>If a medium gets inserted into this device Opie tries to search the medium for Documents. On large mediums this can take some time. You can choose if Opie should scan for Documents globally or on a per medium level. You&apos;re also able to reconfigure each medium.</source>
-        <translation type="obsolete">Si un support est inséré dans l&apos;appareil, Opie tente une recherche de Documents sur ce support. Sur des supports à grande capacité, cela peut prendre un certain temps. Vous pouvez choisir comment Opie parcourt le support à la recherche de Documents, de manière globale ou par type. Vous pouvez aussi reconfigurer chaque support.</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MainWindow</name>
     <message>
         <source>Medium Mount Settings</source>
         <translation>Options montage support</translation>
     </message>
     <message>
         <source>Global</source>
         <translation>Global</translation>
     </message>
 </context>
 <context>
     <name>MediumMountSetting::MediumGlobalWidget</name>
@@ -146,56 +96,13 @@
         <source>Always check this medium</source>
         <translation>Toujours vérifier ce support</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Scanner tous le média</translation>
     </message>
 </context>
-<context>
-    <name>MediumMountWidget</name>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Quel type de fichier</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tous</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Image</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Texte</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Vidéo</translation>
-    </message>
-    <message>
-        <source>Limit search to:</source>
-        <translation type="obsolete">Limiter la recherche à : </translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Ajouter</translation>
-    </message>
-    <message>
-        <source>Always check this medium</source>
-        <translation type="obsolete">Toujours vérifier ce support</translation>
-    </message>
-    <message>
-        <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
-        <translation type="obsolete">Configurer ce support. Les changements prendront effet lorsque l&apos;application sera fermée. Pour mettre à jour l&apos;Onglet des Documents, vous devez enlever puis réinsérer le support.</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/fr/mindbreaker.ts b/i18n/fr/mindbreaker.ts
index 5cb32fe..9fee864 100644
--- a/i18n/fr/mindbreaker.ts
+++ b/i18n/fr/mindbreaker.ts
@@ -9,36 +9,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>Moyenne : %1 tours (%2 jeux)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation>Master Mind</translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Tour %1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">Tour courant %1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Réponse %1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Re-initialiser les statistique</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Réinitialiser la moyenne ?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
diff --git a/i18n/fr/minesweep.ts b/i18n/fr/minesweep.ts
index c6d1e4e..cf6c4b2 100644
--- a/i18n/fr/minesweep.ts
+++ b/i18n/fr/minesweep.ts
@@ -2,28 +2,24 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Vous avez gagné !</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Vous avez explosé !</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Démineur</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Débutant</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Confirmé</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
diff --git a/i18n/fr/mobilemsg.ts b/i18n/fr/mobilemsg.ts
index 8614e6e..64fc32d 100644
--- a/i18n/fr/mobilemsg.ts
+++ b/i18n/fr/mobilemsg.ts
@@ -1,84 +1,45 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <translation type="obsolete">Messages :</translation>
-    </message>
-</context>
-<context>
     <name>MobileMsgBase</name>
     <message>
         <source>Mobile Messaging</source>
         <translation>Gestionnaire SMS</translation>
     </message>
     <message>
         <source>Number:</source>
         <translation>Nombre :</translation>
     </message>
     <message>
         <source>Send</source>
         <translation>Envoyer</translation>
     </message>
     <message>
-        <source>Text</source>
-        <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 type="obsolete">SMS : %1</translation>
-    </message>
-    <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
-        <source>Country:</source>
-        <translation type="obsolete">Pays :</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="obsolete">Logo</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="obsolete">Groupe</translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="obsolete">Image</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="obsolete">Message :</translation>
-    </message>
-    <message>
         <source>EMS</source>
         <translation>EMS</translation>
     </message>
     <message>
-        <source>Tab</source>
-        <translation type="obsolete">Tab</translation>
-    </message>
-    <message>
         <source>SMS</source>
         <translation>SMS</translation>
     </message>
     <message>
         <source>Messages: %1</source>
         <translation>Messages : %1</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Message</translation>
     </message>
     <message>
diff --git a/i18n/fr/odict.ts b/i18n/fr/odict.ts
index 1d67698..5a35e62 100644
--- a/i18n/fr/odict.ts
+++ b/i18n/fr/odict.ts
@@ -2,32 +2,24 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>ConfigDlg</name>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Searchmethod</source>
         <translation>Méthode de recherche</translation>
     </message>
     <message>
-        <source>General Settings</source>
-        <translation type="obsolete">Config. Générale</translation>
-    </message>
-    <message>
-        <source>Searchmethods</source>
-        <translation type="obsolete">Méthodes de recherche</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nouveau</translation>
     </message>
     <message>
         <source>Change</source>
         <translation>Modifier</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Supprimer</translation>
     </message>
 </context>
@@ -37,72 +29,32 @@
         <source>OPIE-Dictionary</source>
         <translation>Dictionnaire OPIE</translation>
     </message>
     <message>
         <source>Query:</source>
         <translation>Requête : </translation>
     </message>
     <message>
         <source>&amp;Ok</source>
         <translation>&amp;Ok</translation>
     </message>
     <message>
-        <source>Config</source>
-        <translation type="obsolete">Config</translation>
-    </message>
-    <message>
         <source>Searchmethods</source>
         <translation>Méthodes de recherche</translation>
     </message>
     <message>
         <source>C&amp;ase sensitive</source>
         <translation>Respecter la C&amp;asse</translation>
     </message>
     <message>
-        <source>Only &amp;complete Words</source>
-        <translation type="obsolete">Les Mots c&amp;omplets seulement</translation>
-    </message>
-    <message>
-        <source>Allow &amp;reg. expressions</source>
-        <translation type="obsolete">Inclure les expressions en&amp;registrées</translation>
-    </message>
-    <message>
-        <source>0 Errors</source>
-        <translation type="obsolete">0 Erreur</translation>
-    </message>
-    <message>
-        <source>1 Errors</source>
-        <translation type="obsolete">1 Erreur</translation>
-    </message>
-    <message>
-        <source>2 Errors</source>
-        <translation type="obsolete">2 Erreurs</translation>
-    </message>
-    <message>
-        <source>3 Errors</source>
-        <translation type="obsolete">3 Erreurs</translation>
-    </message>
-    <message>
-        <source>4 Errors</source>
-        <translation type="obsolete">4 Erreurs</translation>
-    </message>
-    <message>
-        <source>Until Hit</source>
-        <translation type="obsolete">Jusqu&apos;au bout</translation>
-    </message>
-    <message>
-        <source>&amp;Error tolerance</source>
-        <translation type="obsolete">Tolérance d&apos;&amp;Erreur</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Préférences</translation>
     </message>
     <message>
         <source>Parameter</source>
         <translation>Paramètre</translation>
     </message>
     <message>
         <source>Opie-Dictionary</source>
         <translation>Dictionnaire Opie</translation>
     </message>
     <message>
diff --git a/i18n/fr/opie-console.ts b/i18n/fr/opie-console.ts
index 6db2b32..130ee5d 100644
--- a/i18n/fr/opie-console.ts
+++ b/i18n/fr/opie-console.ts
@@ -783,28 +783,24 @@ de DTR (0=non)</translation>
         <source>SynchronizedFile</source>
         <translation>Fichier synchronisé</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Numéro appélé : %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Echec</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">La numérotation du numéro a échouée.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Annulation...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Recherche du modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Initialisation...</translation>
     </message>
     <message>
@@ -849,40 +845,24 @@ de DTR (0=non)</translation>
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Type de terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Combinaison de couleurs</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Taille de police</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">petite</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">moyenne</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">large</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Conversions retours chariots</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Limite interne</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Limite externe</translation>
     </message>
     <message>
diff --git a/i18n/fr/opie-eye.ts b/i18n/fr/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/fr/opie-eye.ts
+++ b/i18n/fr/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/fr/opie-login.ts b/i18n/fr/opie-login.ts
index e7708de..8190ffd 100644
--- a/i18n/fr/opie-login.ts
+++ b/i18n/fr/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <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 type="obsolete">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>
@@ -41,74 +37,52 @@ accurately to calibrate your screen.</source>
 </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 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="obsolete">&lt;center&gt;Bienvenue sur OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
-    </message>
 </context>
 <context>
     <name>PasswordDialog</name>
     <message>
         <source>Set Password</source>
         <comment>Caption of the password dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/fr/opie-sheet.ts b/i18n/fr/opie-sheet.ts
index b43fd1b..501726e 100644
--- a/i18n/fr/opie-sheet.ts
+++ b/i18n/fr/opie-sheet.ts
@@ -489,164 +489,24 @@
         <source>Colum&amp;n</source>
         <translation>Colo&amp;nne</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation>&amp;Feuille</translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>F&amp;unction</translation>
     </message>
     <message>
-        <source>&amp;Standard</source>
-        <translation type="obsolete">S&amp;tandard</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="obsolete">Somme</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="obsolete">&amp;Somme</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="obsolete">Valeur absolue</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="obsolete">&amp;Absolu</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="obsolete">Sinus</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="obsolete">&amp;Sinus</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="obsolete">Arc sinus</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="obsolete">A&amp;rc sinus</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="obsolete">Cosinus</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="obsolete">&amp;Cosinus</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="obsolete">Arc cosinus</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="obsolete">Arc c&amp;osinus</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="obsolete">Tangeante</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="obsolete">&amp;Tangeante</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="obsolete">Arc Tangeante</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="obsolete">Arc Tan&amp;geante</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="obsolete">Arc Tangeante des coordonnées</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="obsolete">Arc Tangeante C&amp;oord.</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="obsolete">Exponentiel</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="obsolete">&amp;Exponentiel</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="obsolete">Logarithme</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="obsolete">&amp;Logarithme</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="obsolete">Puissance</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="obsolete">&amp;Puissance</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="obsolete">&amp;Mathématiques</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">Moyenne</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="obsolete">&amp;Moyenne</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="obsolete">Maximum</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="obsolete">Ma&amp;ximum</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="obsolete">Minimum</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="obsolete">Min&amp;imum</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="obsolete">&amp;Nombre</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="obsolete">&amp;Statistique</translation>
-    </message>
-    <message>
         <source>Functions</source>
         <translation>Fonctions</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation>Nombre de &amp;rangés:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>Nombre de &amp;colonnes:</translation>
     </message>
     <message>
@@ -1104,28 +964,24 @@ http://qtopia.sitebest.com</translation>
     <message>
         <source>&lt;td&gt;Unable to open or parse file!&lt;/td&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <source>Syntax error!</source>
-        <translation type="obsolete">Erreur de syntaxe !</translation>
-    </message>
-    <message>
         <source>Search key not found!</source>
         <translation>Recherche non trouvé !</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Trier</translation>
     </message>
     <message>
         <source>&amp;Options</source>
diff --git a/i18n/fr/opieftp.ts b/i18n/fr/opieftp.ts
index fc2d5e2..e6c4484 100644
--- a/i18n/fr/opieftp.ts
+++ b/i18n/fr/opieftp.ts
@@ -225,28 +225,24 @@ Il doit être vide</translation>
         <translation>Impossible de renomer le fichier
 </translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossible de renomer</translation>
     </message>
     <message>
         <source>That directory does not exist</source>
         <translation>Ce répertoire n&apos;existe pas</translation>
     </message>
     <message>
-        <source>About</source>
-        <translation type="obsolete">A propos</translation>
-    </message>
-    <message>
         <source>Rescan</source>
         <translation>Rafraîchir</translation>
     </message>
     <message>
         <source>New Server name</source>
         <translation>Nouveau nom de serveur</translation>
     </message>
     <message>
         <source>Sorry name already taken</source>
         <translation>Ce nom est déjà utilisé</translation>
     </message>
     <message>
diff --git a/i18n/fr/opieirc.ts b/i18n/fr/opieirc.ts
index e5c8c46..a2803ba 100644
--- a/i18n/fr/opieirc.ts
+++ b/i18n/fr/opieirc.ts
@@ -64,28 +64,24 @@
         <source>Talking on channel</source>
         <translation>Discussion sur le canal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Canal de discution</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Entrez votre message ici pour participer au canal de discution</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Requête</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
@@ -125,116 +121,68 @@
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="obsolete">Commande numérique reçu non supporté : </translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="obsolete">Commande ctcp reçu non supporté : </translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="obsolete">Commande littérale reçu non supporté : </translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Accès à un canal non-existant - Désynchronisé ?</translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="obsolete">canal joint</translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Cette personne a déjà joint le canal - Désynchronisé ?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>Vous êtes déjà inscrit sur ce canal - Désynchronisé ?</translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="obsolete">Vous avez quitté le canal</translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="obsolete">canal quitté</translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Personne en appartée non trouvée - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Canal à par non trouvé - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Canal message avec expéditeur inconnu</translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="obsolete">Canal message avec canal inconnu</translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Message PRIVMSG reçu de type inconnu</translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="obsolete">Vous êtes actuellement référencé comme</translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="obsolete">est référencé comme</translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Surnom d&apos;une personne inconnu changé </translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="obsolete">a quitté</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Personne inconnu a quitté - Désynchronisé ?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>sujet remplacé par</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Sujet du canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Reçu CTCP PING de</translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">Reçu CTPC VERSION de</translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION d&apos;une personne inconnue - Désynchronisé ?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION d&apos;un canal inconnu - Désynchronisé ?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION à bénéficiaire incorrect</translation>
     </message>
     <message>
@@ -313,32 +261,24 @@
         <source>You left channel %1</source>
         <translation>Vous avez quitté le canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 a quitté le canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Message avec numéro de Canal  %1 inconnu</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">Vous êtes enregistrés en tant que %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 est maintenant %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 a quitté (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -528,36 +468,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Nom de profile nécessaire</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Nom d&apos;hote nécessaire</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">Port nécessaire</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>Surnom nécessaire</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">Nom réel nécessaire</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>La liste des canaux nécessite que
 les noms de canaux soient séparés
 par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -590,28 +522,24 @@ par des virgules et commancent par &apos;#&apos; or &apos;+&apos;</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editer le profile du serveur séléctionné</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Ajouter un nouveau profile de serveur</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Connexion à</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Messages serveur</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Entrez les commandes ici. La liste des commandes disponiblent est répertorié dans l&apos;aide</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/opiemail.ts b/i18n/fr/opiemail.ts
index d97aeef..8051350 100644
--- a/i18n/fr/opiemail.ts
+++ b/i18n/fr/opiemail.ts
@@ -1,29 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="obsolete">Répondre</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="obsolete">Répondre à Tous</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Supprimer</translation>
-    </message>
-</context>
-<context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation>Erreur de création du répertoire</translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation>&lt;center&gt;Erreur lors de la création du répertoire - arrêt&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
@@ -173,63 +158,24 @@
         <translation>Attachement</translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation>Supprimer fichier</translation>
     </message>
     <message>
         <source>Add File</source>
         <translation>Ajouter fichier</translation>
     </message>
 </context>
 <context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">Formulaire1</translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="obsolete">CC</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">Objet</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuler</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">Réinitialiser</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="obsolete">File d&apos;Attente</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="obsolete">Envoyer</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="obsolete">De:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="obsolete">A:</translation>
-    </message>
-</context>
-<context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
         <source>Question</source>
         <translation>Question</translation>
@@ -292,28 +238,24 @@
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Config. IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Utilisateur</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Utiliser SSL</translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveur</translation>
     </message>
     <message>
@@ -329,51 +271,24 @@
         <translation>Préfixe</translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished">Utiliser sockets sécurisées :</translation>
     </message>
 </context>
 <context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Affichage</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="obsolete">Composer</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Configurations</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="obsolete">Message</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="obsolete">Boîtes aux Lettres</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="obsolete">Configurer OpieMail</translation>
-    </message>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurations</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation>Composer un nouveau message</translation>
@@ -409,24 +324,76 @@
     <message>
         <source>Sender</source>
         <translation>Expéditeur</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Date</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">Serveur</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished">Répertoire</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished">Créer répertoire</translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -568,248 +535,24 @@ with that filter will be listed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="obsolete">Config OpieMail</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="obsolete">Répertoires</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="obsolete">&amp;Ajouter</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="obsolete">&amp;Modifier</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Supprimer</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="obsolete">Nom répertoire</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="obsolete">Indentité</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="obsolete">Transport</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="obsolete">Entrée</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="obsolete">Répertoire</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="obsolete">Utilisateur</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="obsolete">Serveur</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protocole</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="obsolete">Sortie</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="obsolete">Supprimer boîte aux lettres</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="obsolete">Supprimer la boîte aux lettres ?
-Tous les messages seront détruits.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="obsolete">Config Répertoire OpieMail</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">Description :</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom :</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="obsolete">Config - Identité OpieMail</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="obsolete">Signature :</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="obsolete">Identité :</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom :</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="obsolete">Organisation :</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="obsolete">E-Mail :</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="obsolete">Répondre à</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="obsolete">Utiliser pour répondre</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="obsolete">Entrée OpieMail</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom :</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">Serveur :</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protocole</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="obsolete">Répertoire de Destination</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">Nom Utilisateur :</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Mot de Passe</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">Port</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="obsolete">110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="obsolete">Vérification par intervalle.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="obsolete">Vérifier chaque :</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="obsolete">minutes</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="obsolete">&amp;Détruire sur le serveur les messages supprimés en local.</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="obsolete">&amp;Conserver les Messages sur le Serveur</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="obsolete">Sortie OpieMail</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nom :</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">Protocole</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">Serveur :</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">Nom Utilisateur :</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Mot de Passe</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="obsolete">Le serveur requière une authentification</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">Port</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="obsolete">25</translation>
-    </message>
-</context>
-<context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation>Config. POP3</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
@@ -843,69 +586,34 @@ Tous les messages seront détruits.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">Objet</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="obsolete">A</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="obsolete">Expéditeur</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="obsolete">(Re)éditer</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="obsolete">Copier Dans</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="obsolete">Déplacer Vers</translation>
-    </message>
-</context>
-<context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Config. SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Utiliser SSL</translation>
-    </message>
-    <message>
         <source>Use Login</source>
         <translation>Nécéssite un connexion</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Nom du compte</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Nom du serveur SMTP</translation>
     </message>
     <message>
@@ -999,41 +707,31 @@ Tous les messages seront détruits.</translation>
         <translation>Interval de vérification</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Faire clignoter le led lors de l&apos;arrivé
 de nouveaux messages</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Signal sonore lors de l&apos;arrivé
 d&apos;un nouveau message</translation>
     </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">Formulaire1</translation>
-    </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation>Form1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
-        <translation>TextLabel1</translation>
+        <source>Click activate server/folder</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Afficher texte</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Enregistrer attachement</translation>
     </message>
@@ -1076,32 +774,36 @@ d&apos;un nouveau message</translation>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Confirmez vous la suppression de ce message ? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished">E-mail par %1</translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
-        <source>E-Mail by %1</source>
-        <translation type="obsolete">E-mail par %1</translation>
-    </message>
-    <message>
         <source>Mail</source>
         <translation>Message</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Répondre</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Faire suivre</translation>
     </message>
     <message>
@@ -1123,24 +825,28 @@ d&apos;un nouveau message</translation>
     <message>
         <source>Filename</source>
         <translation>Nom fichier</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Taille</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/fr/opieplayer2.ts b/i18n/fr/opieplayer2.ts
index 4bd1479..8445787 100644
--- a/i18n/fr/opieplayer2.ts
+++ b/i18n/fr/opieplayer2.ts
@@ -97,28 +97,24 @@
         <source>Add all video files</source>
         <translation>Ajouter tous les fichiers video</translation>
     </message>
     <message>
         <source>Add all files</source>
         <translation>Ajouter tous les fichiers</translation>
     </message>
     <message>
         <source>Save Playlist</source>
         <translation>Enregistrer liste</translation>
     </message>
     <message>
-        <source>Open File or URL</source>
-        <translation type="obsolete">Ouvrir un fichier ou une URL</translation>
-    </message>
-    <message>
         <source>Rescan for Audio Files</source>
         <translation>Rechercher les fichiers audio</translation>
     </message>
     <message>
         <source>Rescan for Video Files</source>
         <translation>Rechercher les fichiers video</translation>
     </message>
     <message>
         <source>Full Screen</source>
         <translation>Plein écran</translation>
     </message>
     <message>
@@ -155,36 +151,28 @@ this playlist?</source>
         <translation>Voulez-vous réellement supprimer
 la liste ?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
-        <source>Open file or URL</source>
-        <translation type="obsolete">Ouvrir un fichier ou une URL</translation>
-    </message>
-    <message>
         <source>OpiePlayer: </source>
         <translation>OpiePlayer :</translation>
     </message>
     <message>
-        <source>Save m3u Playlist </source>
-        <translation type="obsolete">Enregistrer liste m3u</translation>
-    </message>
-    <message>
         <source>Loading of Skin started</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -259,44 +247,24 @@ la liste ?</translation>
     <message>
         <source>OpiePlayer - Video</source>
         <translation>OpiePlayer - Video</translation>
     </message>
 </context>
 <context>
     <name>XineControl</name>
     <message>
         <source>Failure</source>
         <translation>Erreur</translation>
     </message>
     <message>
-        <source>No input plugin found for this media type</source>
-        <translation type="obsolete">Pas de plugin trouvé pour ce type de média</translation>
-    </message>
-    <message>
-        <source>No demux plugin found for this media type</source>
-        <translation type="obsolete">Pas de plugin &quot;demux&quot; trouvé pour ce type de média</translation>
-    </message>
-    <message>
-        <source>Demuxing failed for this media type</source>
-        <translation type="obsolete">problème de &quot;demuxing&quot; pour ce type de média</translation>
-    </message>
-    <message>
-        <source>Malformed MRL</source>
-        <translation type="obsolete">MRL mal formée</translation>
-    </message>
-    <message>
-        <source>Some other error</source>
-        <translation type="obsolete">D&apos;autres erreurs</translation>
-    </message>
-    <message>
         <source>Error on file &apos;%1&apos; with reason: </source>
         <comment>Error when playing a file</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No input plugin found for this media type&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;No demux plugin found for this media type&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/fr/opierec.ts b/i18n/fr/opierec.ts
index 232fabe..10ccd59 100644
--- a/i18n/fr/opierec.ts
+++ b/i18n/fr/opierec.ts
@@ -28,72 +28,40 @@
         <source>Time</source>
         <translation>Heure</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Fichiers</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Echantillonage</translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">44100</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">32000</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">22050</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">16000</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">11025</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">8000</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>Limite de taille</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sans limite</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Répertoire fichier</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Profond. bit</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">16</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">8</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Options</translation>
     </message>
     <message>
@@ -104,58 +72,36 @@
         <source>Low Disk Space</source>
         <translation>Espace disque insuffisant</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Vous avez plus assez
 de place sur le disque ou
 votre carte n&apos;est pas reconnue</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">seconds</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Confirmez vous &lt;font size=+2&gt;&lt;B&gt;la suppression&lt;/B&gt;&lt;/font&gt;
-des fichiers sélectionnés ?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Oui</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Non</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Impossible de supprimer le fichier.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Veuillez sélectionner un fichier à jouer</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <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>
@@ -172,60 +118,36 @@ des fichiers sélectionnés ?</translation>
         <source>Ir Beam out</source>
         <translation>Transmission 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 type="obsolete">Rec</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Emplacement</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compression (fichiers plus petits)</translation>
     </message>
     <message>
-        <source>auto Mute</source>
-        <translation type="obsolete">Silence auto </translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>Silence</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Stopper</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation>Silence auto</translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="obsolete">Canaux stéréo</translation>
-    </message>
-    <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select file to play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/fr/osearch.ts b/i18n/fr/osearch.ts
index 5e53cea..5c8f1b4 100644
--- a/i18n/fr/osearch.ts
+++ b/i18n/fr/osearch.ts
@@ -38,28 +38,24 @@
         <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 type="obsolete">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>Rechercher : </translation>
     </message>
     <message>
@@ -72,36 +68,24 @@
     </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 type="obsolete">montrer les tâches terminées</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">montrer événements passés</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">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>
@@ -116,28 +100,24 @@
         <source>Link: </source>
         <translation>Lien : </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Type mime : </translation>
     </message>
     <message>
         <source>open with </source>
         <translation>ouvrir avec </translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">rechercher contenu</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>recherche de %1</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>
diff --git a/i18n/fr/oxygen.ts b/i18n/fr/oxygen.ts
index 5b34392..853a18c 100644
--- a/i18n/fr/oxygen.ts
+++ b/i18n/fr/oxygen.ts
@@ -2,87 +2,67 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CalcDlg</name>
     <message>
         <source>Calculate</source>
         <translation>Calculer</translation>
     </message>
     <message>
         <source>Clear</source>
         <translation>Effacer</translation>
     </message>
     <message>
-        <source>Form1</source>
-        <translation type="obsolete">Form1</translation>
-    </message>
-    <message>
         <source>Molecular Weight</source>
         <translation>Masse molaire</translation>
     </message>
     <message>
         <source>Chemical Formula</source>
         <translation>Formule chimique</translation>
     </message>
     <message>
         <source>Molecular Weight (u):</source>
         <translation>Masse molaire (u):</translation>
     </message>
     <message>
         <source>Elemental Composition (%):</source>
         <translation>Composition élémentaire (%) : </translation>
     </message>
     <message>
         <source>CalcDlg</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OxydataWidget</name>
     <message>
-        <source>Weight:</source>
-        <translation type="obsolete">Masse : </translation>
-    </message>
-    <message>
         <source>Block</source>
         <translation>Famille</translation>
     </message>
     <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electronégativité</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Rayon atomique</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Energie d&apos;ionisation</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Densité</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Point d&apos;ébullition</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Point de fusion</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
@@ -574,450 +554,14 @@
         <source>ERROR: 
 </source>
         <translation>ERREUR :
 </translation>
     </message>
 </context>
 <context>
     <name>dataWidgetUI</name>
     <message>
         <source>Chemical Data</source>
         <translation>Données chimiques</translation>
     </message>
-    <message>
-        <source>Hydrogen</source>
-        <translation type="obsolete">Hydrogène</translation>
-    </message>
-    <message>
-        <source>Helium</source>
-        <translation type="obsolete">Hellium</translation>
-    </message>
-    <message>
-        <source>Lithium</source>
-        <translation type="obsolete">Lithium</translation>
-    </message>
-    <message>
-        <source>Beryllium</source>
-        <translation type="obsolete">Béryllium</translation>
-    </message>
-    <message>
-        <source>Boron</source>
-        <translation type="obsolete">Bore</translation>
-    </message>
-    <message>
-        <source>Carbon</source>
-        <translation type="obsolete">Carbone</translation>
-    </message>
-    <message>
-        <source>Nitrogen</source>
-        <translation type="obsolete">Azote</translation>
-    </message>
-    <message>
-        <source>Oxygen</source>
-        <translation type="obsolete">Oxygène</translation>
-    </message>
-    <message>
-        <source>Fluorine</source>
-        <translation type="obsolete">Fluore</translation>
-    </message>
-    <message>
-        <source>Neon</source>
-        <translation type="obsolete">Néon</translation>
-    </message>
-    <message>
-        <source>Sodium</source>
-        <translation type="obsolete">Sodium</translation>
-    </message>
-    <message>
-        <source>Magnesium</source>
-        <translation type="obsolete">Magnésium</translation>
-    </message>
-    <message>
-        <source>Aluminum</source>
-        <translation type="obsolete">Aluminum</translation>
-    </message>
-    <message>
-        <source>Silicon</source>
-        <translation type="obsolete">Silicium</translation>
-    </message>
-    <message>
-        <source>Phosphorus</source>
-        <translation type="obsolete">Phosphore</translation>
-    </message>
-    <message>
-        <source>Sulfur</source>
-        <translation type="obsolete">Soufre</translation>
-    </message>
-    <message>
-        <source>Chlorine</source>
-        <translation type="obsolete">Chlore</translation>
-    </message>
-    <message>
-        <source>Argon</source>
-        <translation type="obsolete">Argon</translation>
-    </message>
-    <message>
-        <source>Potassium</source>
-        <translation type="obsolete">Potassium</translation>
-    </message>
-    <message>
-        <source>Calcium</source>
-        <translation type="obsolete">Calcium</translation>
-    </message>
-    <message>
-        <source>Scandium</source>
-        <translation type="obsolete">Scandium</translation>
-    </message>
-    <message>
-        <source>Titanium</source>
-        <translation type="obsolete">Titane</translation>
-    </message>
-    <message>
-        <source>Vanadium</source>
-        <translation type="obsolete">Vanadium</translation>
-    </message>
-    <message>
-        <source>Chromium</source>
-        <translation type="obsolete">Chrome</translation>
-    </message>
-    <message>
-        <source>Manganese</source>
-        <translation type="obsolete">Manganèse</translation>
-    </message>
-    <message>
-        <source>Iron</source>
-        <translation type="obsolete">Fer</translation>
-    </message>
-    <message>
-        <source>Cobalt</source>
-        <translation type="obsolete">Cobalt</translation>
-    </message>
-    <message>
-        <source>Nickel</source>
-        <translation type="obsolete">Nickel</translation>
-    </message>
-    <message>
-        <source>Copper</source>
-        <translation type="obsolete">Cuivre</translation>
-    </message>
-    <message>
-        <source>Zinc</source>
-        <translation type="obsolete">Zinc</translation>
-    </message>
-    <message>
-        <source>Gallium</source>
-        <translation type="obsolete">Gallium</translation>
-    </message>
-    <message>
-        <source>Germanium</source>
-        <translation type="obsolete">Germanium</translation>
-    </message>
-    <message>
-        <source>Arsenic</source>
-        <translation type="obsolete">Arsenique</translation>
-    </message>
-    <message>
-        <source>Selenium</source>
-        <translation type="obsolete">Sélénium</translation>
-    </message>
-    <message>
-        <source>Bromine</source>
-        <translation type="obsolete">Brome</translation>
-    </message>
-    <message>
-        <source>Krypton</source>
-        <translation type="obsolete">Krypton</translation>
-    </message>
-    <message>
-        <source>Rubidium</source>
-        <translation type="obsolete">Rubidium</translation>
-    </message>
-    <message>
-        <source>Strontium</source>
-        <translation type="obsolete">Strontium</translation>
-    </message>
-    <message>
-        <source>Yttrium</source>
-        <translation type="obsolete">Yttrium</translation>
-    </message>
-    <message>
-        <source>Zirconium</source>
-        <translation type="obsolete">Zirconium</translation>
-    </message>
-    <message>
-        <source>Niobium</source>
-        <translation type="obsolete">Niobium</translation>
-    </message>
-    <message>
-        <source>Molybdenum</source>
-        <translation type="obsolete">Molybdène</translation>
-    </message>
-    <message>
-        <source>Technetium</source>
-        <translation type="obsolete">Technitium</translation>
-    </message>
-    <message>
-        <source>Ruthenium</source>
-        <translation type="obsolete">Ruthénium</translation>
-    </message>
-    <message>
-        <source>Rhodium</source>
-        <translation type="obsolete">Rhodium</translation>
-    </message>
-    <message>
-        <source>Palladium</source>
-        <translation type="obsolete">Palladium</translation>
-    </message>
-    <message>
-        <source>Silver</source>
-        <translation type="obsolete">Argent</translation>
-    </message>
-    <message>
-        <source>Cadmium</source>
-        <translation type="obsolete">Cadmium</translation>
-    </message>
-    <message>
-        <source>Indium</source>
-        <translation type="obsolete">Indium</translation>
-    </message>
-    <message>
-        <source>Tin</source>
-        <translation type="obsolete">Etain</translation>
-    </message>
-    <message>
-        <source>Antimony</source>
-        <translation type="obsolete">Antimoine</translation>
-    </message>
-    <message>
-        <source>Tellurium</source>
-        <translation type="obsolete">Tellure</translation>
-    </message>
-    <message>
-        <source>Iodine</source>
-        <translation type="obsolete">Iode</translation>
-    </message>
-    <message>
-        <source>Xenon</source>
-        <translation type="obsolete">Xénon</translation>
-    </message>
-    <message>
-        <source>Cesium</source>
-        <translation type="obsolete">Césium</translation>
-    </message>
-    <message>
-        <source>Barium</source>
-        <translation type="obsolete">Barium</translation>
-    </message>
-    <message>
-        <source>Lanthanum</source>
-        <translation type="obsolete">Lanthane</translation>
-    </message>
-    <message>
-        <source>Cerium</source>
-        <translation type="obsolete">Cérium</translation>
-    </message>
-    <message>
-        <source>Praseodymium</source>
-        <translation type="obsolete">Praséodyme</translation>
-    </message>
-    <message>
-        <source>Neodymium</source>
-        <translation type="obsolete">Néodyme</translation>
-    </message>
-    <message>
-        <source>Promethium</source>
-        <translation type="obsolete">Prométhium</translation>
-    </message>
-    <message>
-        <source>Samarium</source>
-        <translation type="obsolete">Samarium</translation>
-    </message>
-    <message>
-        <source>Europium</source>
-        <translation type="obsolete">Europium</translation>
-    </message>
-    <message>
-        <source>Gadolinium</source>
-        <translation type="obsolete">Gadolinium</translation>
-    </message>
-    <message>
-        <source>Terbium</source>
-        <translation type="obsolete">Terbium</translation>
-    </message>
-    <message>
-        <source>Dysprosium</source>
-        <translation type="obsolete">Dysprosium</translation>
-    </message>
-    <message>
-        <source>Holmium</source>
-        <translation type="obsolete">Holmium</translation>
-    </message>
-    <message>
-        <source>Erbium</source>
-        <translation type="obsolete">Erbium</translation>
-    </message>
-    <message>
-        <source>Thulium</source>
-        <translation type="obsolete">Thulium</translation>
-    </message>
-    <message>
-        <source>Ytterbium</source>
-        <translation type="obsolete">Ytterbium</translation>
-    </message>
-    <message>
-        <source>Lutetium</source>
-        <translation type="obsolete">Lutétium</translation>
-    </message>
-    <message>
-        <source>Hafnium</source>
-        <translation type="obsolete">Hafnium</translation>
-    </message>
-    <message>
-        <source>Tantalum</source>
-        <translation type="obsolete">Tantale</translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="obsolete">Tungsten</translation>
-    </message>
-    <message>
-        <source>Rhenium</source>
-        <translation type="obsolete">Rhénium</translation>
-    </message>
-    <message>
-        <source>Osmium</source>
-        <translation type="obsolete">Osmium</translation>
-    </message>
-    <message>
-        <source>Iridium</source>
-        <translation type="obsolete">Iridium</translation>
-    </message>
-    <message>
-        <source>Platinum</source>
-        <translation type="obsolete">Platine</translation>
-    </message>
-    <message>
-        <source>Gold</source>
-        <translation type="obsolete">Or</translation>
-    </message>
-    <message>
-        <source>Mercury</source>
-        <translation type="obsolete">Mercure</translation>
-    </message>
-    <message>
-        <source>Thallium</source>
-        <translation type="obsolete">Thallium</translation>
-    </message>
-    <message>
-        <source>Lead</source>
-        <translation type="obsolete">Plomb</translation>
-    </message>
-    <message>
-        <source>Bismuth</source>
-        <translation type="obsolete">Bismuth</translation>
-    </message>
-    <message>
-        <source>Polonium</source>
-        <translation type="obsolete">Polonium</translation>
-    </message>
-    <message>
-        <source>Astatine</source>
-        <translation type="obsolete">Astate</translation>
-    </message>
-    <message>
-        <source>Radon</source>
-        <translation type="obsolete">Radon</translation>
-    </message>
-    <message>
-        <source>Francium</source>
-        <translation type="obsolete">Francium</translation>
-    </message>
-    <message>
-        <source>Radium</source>
-        <translation type="obsolete">Radium</translation>
-    </message>
-    <message>
-        <source>Actinium</source>
-        <translation type="obsolete">Actinium</translation>
-    </message>
-    <message>
-        <source>Thorium</source>
-        <translation type="obsolete">Thorium</translation>
-    </message>
-    <message>
-        <source>Protactinium</source>
-        <translation type="obsolete">Protactinium</translation>
-    </message>
-    <message>
-        <source>Uranium</source>
-        <translation type="obsolete">Uranium</translation>
-    </message>
-    <message>
-        <source>Neptunium</source>
-        <translation type="obsolete">Neptunium</translation>
-    </message>
-    <message>
-        <source>Plutonium</source>
-        <translation type="obsolete">Plutonium</translation>
-    </message>
-    <message>
-        <source>Americium</source>
-        <translation type="obsolete">Américium</translation>
-    </message>
-    <message>
-        <source>Curium</source>
-        <translation type="obsolete">Curium</translation>
-    </message>
-    <message>
-        <source>Berkelium</source>
-        <translation type="obsolete">Berkélium</translation>
-    </message>
-    <message>
-        <source>Californium</source>
-        <translation type="obsolete">Californium</translation>
-    </message>
-    <message>
-        <source>Einsteinium</source>
-        <translation type="obsolete">Einsteinium</translation>
-    </message>
-    <message>
-        <source>Fermium</source>
-        <translation type="obsolete">Fermium</translation>
-    </message>
-    <message>
-        <source>Mendelevium</source>
-        <translation type="obsolete">Mendélévium</translation>
-    </message>
-    <message>
-        <source>Nobelium</source>
-        <translation type="obsolete">Nobélium</translation>
-    </message>
-    <message>
-        <source>Lawrencium</source>
-        <translation type="obsolete">Lawrencium</translation>
-    </message>
-    <message>
-        <source>Rutherfordium</source>
-        <translation type="obsolete">Rutherfordium</translation>
-    </message>
-    <message>
-        <source>Dubnium</source>
-        <translation type="obsolete">Dubnium</translation>
-    </message>
-    <message>
-        <source>Seaborgium</source>
-        <translation type="obsolete">Seaborgium</translation>
-    </message>
-    <message>
-        <source>Bohrium</source>
-        <translation type="obsolete">Bohrium</translation>
-    </message>
-    <message>
-        <source>Hassium</source>
-        <translation type="obsolete">Hassium</translation>
-    </message>
-    <message>
-        <source>Meitnerium</source>
-        <translation type="obsolete">Meitnerium</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/fr/patience.ts b/i18n/fr/patience.ts
index 51ead96..6719ff3 100644
--- a/i18n/fr/patience.ts
+++ b/i18n/fr/patience.ts
@@ -6,68 +6,44 @@
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jeu</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Changer le Dos des Cartes</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Aider Positionnement</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Options</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>A &amp;propos</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Changer le Dos des Cartes</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Aider Positionnement</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Retourner Une Carte</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Options</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Retourner Trois Cartes</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
diff --git a/i18n/fr/qpe.ts b/i18n/fr/qpe.ts
index 3133ba1..7887795 100644
--- a/i18n/fr/qpe.ts
+++ b/i18n/fr/qpe.ts
@@ -58,98 +58,31 @@
         <translation>Erreur</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossible de trouver l&apos;application %1&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Problème de l&apos;application</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 ne répond pas.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Voulez-vous forcer l&apos;application à quitter?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Cliquez sur la croix fermement et
 avec précision pour calibrer l&apos;écran.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Bienvenue sur Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documents</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Vue Icône</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Vue Liste</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Le niveau de batterie est critique !
-Eteigner la machine jusqu&apos;à ça recharge !</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">Le niveau de batterie est très bas.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
-Veuillez rechargez la batterie de sauvegarde.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">business card</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Information</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;La date système ne semble pas être valide.
-(%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Status batterie</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Batterie faible</translation>
     </message>
 </context>
@@ -167,28 +100,24 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Cliquez sur l&apos;écran pour continuer.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Chargement de la configuration de %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Veuillez patienter...</translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation type="obsolete">Premier arriere plan</translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation>Terminer</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
@@ -201,32 +130,24 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
         <source> - Launcher</source>
         <translation>- Lanceur</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Pas d&apos;application</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation>&lt;p&gt;Aucune application définie pour ce document.&lt;p&gt;Type %1.</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Recherche de documents</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Recherche de documents</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation>Documents</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>View as text</source>
         <translation>Ouvrir avec l&apos;éditeur de texte</translation>
     </message>
 </context>
@@ -243,107 +164,44 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
     <message>
         <source>List View</source>
         <translation>Vue Liste</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;L&apos;onglet Documents&lt;p&gt;a été désactivé.&lt;p&gt;Utilisez Paramètres-&gt;Lanceur-&gt;Onglet Document&lt;p&gt;pour le réactiver.&lt;/b&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">Fichiers %1</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Tous les fichiers</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation>Vue Document</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Tous types</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Nouveau média de stockage détecté : </translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Que dois faire le programme ?</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Media inséré</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">Un &lt;b&gt;média de stockage&lt;/b&gt; a été inséré. Doit-il être parcouru à la recherche de fichiers?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Quels fichiers</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Image</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Texte</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Vidéo</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tous</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Lier apps</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Limiter la recherche au répertoire: (pas encore utilisé)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Ajouter</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">Votre choix va être enregistré sur le média.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">Ne plus demander pour ce média</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>Configure le média. Les modifications prendront effet lorsque vous quitterez cette application. Pour mettre à jour l&apos;onglet Document, vous devrez enlever et réinsérer le média.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Quels fichiers</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
@@ -377,31 +235,24 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
         <translation>Supprimer</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Scanner tout le média</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Toujours vérifier 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>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Mode sans échec</translation>
     </message>
@@ -429,40 +280,24 @@ Veuillez rechargez la batterie de sauvegarde.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;La date système ne semble pas être valide.
 (%1)&lt;/p&gt;&lt;p&gt; Voulez-vous la corriger ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Le niveau de batterie est critique !
-Eteigner la machine jusqu&apos;à ça recharge !</translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="obsolete">Battery très faible.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">La niveau de la batterie de sauvegarde est très bas.
-Veuillez rechargez la batterie de sauvegarde.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation>carte de visite</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Mode sans échec</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Une erreur s&apos;est produite lors du démarrage et le système est maintenant en mode sans échec. Les plugins ne sont pas démarrés en mode sans échec. Vous pouvez utiliser le Gestionnaire de Plugin pour désactiver le ou les plugins causant l&apos;erreur.</translation>
     </message>
     <message>
@@ -526,80 +361,59 @@ application immédiatement.</translation>
         <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 type="obsolete">&lt;p&gt;Ces options sont destinés à être utilisées durant le développement et les tests du système Opie. Dans des conditions normales d&apos;utilisation, ces concepts ne sont pas nécessaires.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Arrêt...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Connexion syncho</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus vieille que 1.5.1, vous devriez la mettre à jour.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation>Refuser</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt; Si vous venez juste de démarrer une synchronisation pour la 1ère fois, c&apos;est normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Autoriser</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation>&lt;p&gt;Un systeme non autorisé demande l&apos;accès à ce périphérique.&lt;p&gt;Si vous utiliser une version de &quot;Qtopia Desktop&quot; plus ancienne que la 1.5.1, vous devriez la mettre à jour ou changer les paramètres de sécurité pour utiliser IntelliSync.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Un systeme non authorisé demande l&apos;accès à ce périphérique.&lt;p&gt;Vous avez choisi IntelliSync donc vous avez la possibilité d&apos;accepter ou de refuser cette connexion.&lt;qt&gt;</translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Synchronisation en cours</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Contacts&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Annuler</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation>Abandonner</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchronise : </translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/security.ts b/i18n/fr/security.ts
index 3c5613f..9e39d1d 100644
--- a/i18n/fr/security.ts
+++ b/i18n/fr/security.ts
@@ -66,60 +66,28 @@ Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</transl
         <source>Login</source>
         <translation type="unfinished">Nom de connexion</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Synchronisation</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished">Attention</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">Tous</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Aucun</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -194,313 +162,24 @@ Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</transl
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Annuler</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Entrer le
-mot de passe</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Changer le
-mot de passe</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Entrer mot de passe</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Mot de passe incorrect</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Le mot de passe est incorrect.
-Accès refusé</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Tous</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Aucun</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Entrer le nouveau mot de passe</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Réentrez le mot de passe</translation>
-    </message>
-    <message>
-        <source>Attention</source>
-        <translation type="obsolete">Attention</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Tous les paramètres utilisateurs seront perdus.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuler</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="obsolete">ATTENTION</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="obsolete">&lt;p&gt;Sélectionnez IntelliSync ici désactivera le mot de passe FTP.&lt;p&gt;Chaque machine de votre sous réseau pourra se synchroniser avec votre Zaurus!</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Paramètres de sécurité</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Changer le
-mot de passe</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Effacer le
-mot de passe</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Demander le mot de passe au démarrage</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Synchronisation</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Accepter la synchronisation par réseau de : </translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Tous</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Aucun</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Ce mot de passe vous permet de protéger l&apos;accès à votre organiseur.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (par défaut)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Mot de Passe</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Nom de connexion</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">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="obsolete">Ce bouton vous permet de changer le mot de passe de sécurité
-
-Note : Ne pas confondre avec le mot de passe de synchronisation.</translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="obsolete">Supprimer le mot de passe courant.
-Vous pourrez en entrer un nouveau à n&apos;importe qu&apos;elle moment.</translation>
-    </message>
-    <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation type="obsolete">Si vous activez cette option, un mot de passe sera demandé après chaque allumage du Zaurus.</translation>
-    </message>
-    <message>
-        <source>If you select this option, opie-login will automagically log you in with the user you have selected in the drop-down list.  
-
-For the Zaurus 5x00 this is always the user &quot;root&quot;.</source>
-        <translation type="obsolete">Si vous activez cette option, opie-login vous ouvrira automatiquement une session avec le nom d&apos;utilisateur de la liste déroulante.
-
-Pour le Zaurus 5x00 c&apos;est toujours l&apos;utilisateur &quot;root&quot;.</translation>
-    </message>
-    <message>
-        <source>This drop-down list allows you to select the user for auto-login
-(if enabled above).  
-
-You can only select an actually configured user.</source>
-        <translation type="obsolete">Cette liste déroulante vous permet de sélectionnez le nom d&apos;utilisateur à utiliser lors de l&apos;ouverture de session automatique.
-
-Vous ne pouvez sélectionner qu&apos;un nom d&apos;utilisateur existant.</translation>
-    </message>
-    <message>
-        <source>Select a net-range or enter a new one.  
-
-This drop-down list lets you select a net range which is allowed to connect to your Zaurus.  
-
-For example, a net range of 192.168.1.0/24 will allow any machine with an IP between 192.168.1.1 and 192.168.1.254 to connect to (and sync with) your Zaurus.  
-
-The entry &quot;All&quot; will allow *any* IP to connect. 
-The entry &quot;None&quot; will *deny* any connection.  
-
-If unsure, select &quot;Any&quot;.</source>
-        <translation type="obsolete">Sélectionnez une plage d&apos;adresses IP.
-
-Cette liste déroulante vous permet de sélectionnez qui du réseau peut se connecter à votre Zaurus.
-
-Par exemple, une plage d&apos;adresses du type  192.168.1.0/24 permettra aux machines ayant une adresse IP entre 192.168.1.1 et  192.168.1.254 de se connecter (et se synchroniserà avec le Zaurus.
-
-L&apos;option &quot;Tous&quot; permet à *toutes* adresse IP de se connecter.
-L&apos;option &quot;Aucun&quot; empêchera *toutes* adresse IP de se connecter.
-
-Si vous n&apos;êtes pas sur, sélectionnez &quot;Tous&quot;.</translation>
-    </message>
-    <message>
-        <source>Delete Entry</source>
-        <translation type="obsolete">Supprimer entrée</translation>
-    </message>
-    <message>
-        <source>Delete the selected net range from the list
-
-If you press this button, the currently selected net range will be deleted from the list of net ranges.
-
-If you hit this button in error, the button &quot;Restore Defaults&quot; will restore
-the list to the state it has been when you initially booted your Zaurus.</source>
-        <translation type="obsolete">Supprime la plage d&apos;adresse IP de la liste.</translation>
-    </message>
-    <message>
-        <source>Restore Defaults</source>
-        <translation type="obsolete">Paramètres par défaut</translation>
-    </message>
-    <message>
-        <source>This button will restore the list of net ranges
-to the defaults.
-
-Beware that all manually entered net ranges will be lost!</source>
-        <translation type="obsolete">Ce bouton restaure une liste de plage IP par défaut.
-
-Attention : Toutes les plages d&apos;adresse IP entrées manuellement seront perdus!</translation>
-    </message>
-    <message>
-        <source>Select your sync software</source>
-        <translation type="obsolete">Sélectionnez votre logiciel de synchronisation</translation>
-    </message>
-    <message>
-        <source>QTopia</source>
-        <translation type="obsolete">QTopia</translation>
-    </message>
-    <message>
-        <source>IntelliSync</source>
-        <translation type="obsolete">IntelliSync</translation>
-    </message>
-    <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
-        <translation type="obsolete">Cette option change la façon dont le serveur FTP interne accepte les connections.
-
-Si vous avez un problème de synchronisation, essayez le paramètrage &quot;IntelliSync&quot; qui acceptera tous les mots de passe reçu sur le port de synchronisation (FTP).
-
-Le paramètrage par défaut est Qtopia. Il permet de se connecter en tant qu&apos;utilisateur &quot;root&quot; et comme mot de passe &quot;Qtopia&quot;.
-
-Attention : les mots de passe sont sensibles à la case (i.e HeLLo est différent de Hello).</translation>
-    </message>
-    <message>
-        <source>Qtopia 1.7</source>
-        <translation type="obsolete">Qtopia 1.7</translation>
-    </message>
-    <message>
-        <source>Opie 1.0</source>
-        <translation type="obsolete">Opie 1.0</translation>
-    </message>
-    <message>
-        <source>Both</source>
-        <translation type="obsolete">Les deux</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Synchronisation</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Accepter la synchronisation par réseau de : </translation>
diff --git a/i18n/fr/snake.ts b/i18n/fr/snake.ts
index 8bd1a57..aa22371 100644
--- a/i18n/fr/snake.ts
+++ b/i18n/fr/snake.ts
@@ -14,40 +14,32 @@
         <source>SNAKE!</source>
         <translation>SERPENT !</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Utilisez les touches de directions pour contrôler
 le serpent. Le but est de manger le plus de souris
 sans rentrer dans les murs ni se modre la queue.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Appuyez sur n&apos;importe quelle touche pour commencer</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>    Score :    %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER !
 Votre score : %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Pressez n&apos;importe quelle touche pour recommencer.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Pressez une touche pour commencer</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Pressez une touche pour commencer
 une nouvelle partie.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/fr/sysinfo.ts b/i18n/fr/sysinfo.ts
index 274bf0c..d1dbfda 100644
--- a/i18n/fr/sysinfo.ts
+++ b/i18n/fr/sysinfo.ts
@@ -50,28 +50,24 @@
         <source>&amp;Start Tests!</source>
         <translation>&amp;Démarrer les tests !</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Cliquez ici pour démarrer les tests sélectionnés.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Sélectionnez un modèle d&apos;appareil pour réaliser les comparaisons.</translation>
     </message>
     <message>
-        <source>Compare To:</source>
-        <translation type="obsolete">Comparer avec : </translation>
-    </message>
-    <message>
         <source>error</source>
         <translation>Erreur</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
@@ -149,40 +145,24 @@ le système (%)</translation>
         <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 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>Cette page affiche la quantité de mémoire (i.e RAM) utilisée par votre appareil.
 Cette quantité mémoire est découpée en plusieurs catégories :
 
 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
@@ -200,67 +180,52 @@ Cette quantité mémoire est découpée en plusieurs catégories :
         <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
-
-</translation>
-    </message>
-    <message>
         <source>Used by</source>
         <translation>Utilisé par</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">Vous désirez vraiment exécuter %1 pour ce module ?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Confirmez vous l&apos;execution de
 %1 pour ce module ?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Utilisé (%1 Ko)</translation>
     </message>
@@ -307,116 +272,31 @@ Cliquez et maintenez appuyer pour voir les informations à propos du processus o
         <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 type="obsolete">Vous désirez vraiment envoyer %1 à ce processus ?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Voulez-vous vraiment envoyer %1
 à ce processus ?</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>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation type="obsolete">Ce graphe représente combien de mémoire est actuellement  utilisée sur cette carte de mémoire Secure Digital.</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation type="obsolete">SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation type="obsolete">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="obsolete">Ce graphe représente cobien de mémoire est actuellement  utilisée dans la mémoire centrale (ie  mémoire Flash).</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation type="obsolete">Disque RAM</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation type="obsolete">RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation type="obsolete">Ce graphe représente combien de mémoire est actuellement  utilisée sur le dique RAM.</translation>
-    </message>
-</context>
-<context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Info système</translation>
     </message>
     <message>
         <source>Memory</source>
         <translation>Memoire</translation>
     </message>
     <message>
         <source>Storage</source>
         <translation>Stockage</translation>
@@ -460,32 +340,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Modèle : </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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 affiche 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>&lt;br&gt;Modèle : </translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Vendeur : </translation>
     </message>
     <message>
diff --git a/i18n/fr/systemtime.ts b/i18n/fr/systemtime.ts
index de840b3..78c356e 100644
--- a/i18n/fr/systemtime.ts
+++ b/i18n/fr/systemtime.ts
@@ -60,36 +60,24 @@
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Options</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Prévoir</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="obsolete">Vous avez demandé un délai de</translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="obsolete">minutes, mais seulement</translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="obsolete">minutes sont écoulées depuis la dernière vérification&lt;br&gt;Continuer?</translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation>Continuer ?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>Exécution de :
 ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erreur</translation>
@@ -104,28 +92,24 @@ ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Serveur NTP</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>Erreur lors de la récupération de l&apos;heure
 à partir de l&apos;heure du serveur:</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">secondes</translation>
-    </message>
-    <message>
         <source>Could not connect to server </source>
         <translation>Impossible de se connecter au serveur</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation>Vous avez demandé un délai de %1 minutes, mais seulement %2 minutes se sont écoulées.&lt;br&gt;Continuer ?</translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation>%1 secondes</translation>
     </message>
     <message>
@@ -148,215 +132,24 @@ ntpdate</translation>
         <translation>Temps écoulé</translation>
     </message>
     <message>
         <source>New time</source>
         <translation>Nouvelle heure</translation>
     </message>
     <message>
         <source>Get time from the network</source>
         <translation>Récupérer l&apos;heure sur serveur NMP</translation>
     </message>
 </context>
 <context>
-    <name>Ntp</name>
-    <message>
-        <source>time.fu-berlin.de</source>
-        <translation type="obsolete">chronos.cru.fr</translation>
-    </message>
-    <message>
-        <source>Run NTP?</source>
-        <translation type="obsolete">Lancer NTP?</translation>
-    </message>
-    <message>
-        <source>Running:</source>
-        <translation type="obsolete">Running:</translation>
-    </message>
-    <message>
-        <source>Error while executing ntpdate</source>
-        <translation type="obsolete">Erreur lors de l&apos;execution de ntpdate</translation>
-    </message>
-    <message>
-        <source> seconds</source>
-        <translation type="obsolete">secondes</translation>
-    </message>
-    <message>
-        <source>last [h]</source>
-        <translation type="obsolete">dernier [h]</translation>
-    </message>
-    <message>
-        <source>offset [s]</source>
-        <translation type="obsolete">offset [s]</translation>
-    </message>
-    <message>
-        <source>shift [s/h]</source>
-        <translation type="obsolete">Décalage [s/h]</translation>
-    </message>
-    <message>
-        <source> s/h</source>
-        <translation type="obsolete">s/h</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Obtenir l&apos;heure par le réseau</translation>
-    </message>
-    <message>
-        <source>Set predicted time: </source>
-        <translation type="obsolete">Prévision de l&apos;heure:</translation>
-    </message>
-    <message>
-        <source>Could not connect to server </source>
-        <translation type="obsolete">Impossible de se connecter au serveur</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Prévoir</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Géneral</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Options</translation>
-    </message>
-    <message>
-        <source>ntp error</source>
-        <translation type="obsolete">erreur ntp</translation>
-    </message>
-    <message>
-        <source>Error while getting time form network!</source>
-        <translation type="obsolete">Erreur lors de l&apos;obtention de l&apos;heure par le réseau !</translation>
-    </message>
-    <message>
-        <source>Error while getting time form
- server</source>
-        <translation type="obsolete">Lancer NTP ?</translation>
-    </message>
-    <message>
-        <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup. &lt;br&gt; Rerun NTP?</source>
-        <translation type="obsolete">Vous avez demandé un délai de %1, mais seulement %2 minute(s) se sont écoulée(s).&lt;br&gt; Relancer NTP ?</translation>
-    </message>
-</context>
-<context>
-    <name>NtpBase</name>
-    <message>
-        <source>Network Time</source>
-        <translation type="obsolete">Network Time</translation>
-    </message>
-    <message>
-        <source>Get time from network</source>
-        <translation type="obsolete">Obtenir la date d&apos;un serveur NTP</translation>
-    </message>
-    <message>
-        <source>Start Time:</source>
-        <translation type="obsolete">Heure de départ:</translation>
-    </message>
-    <message>
-        <source>nan</source>
-        <translation type="obsolete">Aucune</translation>
-    </message>
-    <message>
-        <source>Time Shift:</source>
-        <translation type="obsolete">Décalage de l&apos;heure:</translation>
-    </message>
-    <message>
-        <source>New Time:</source>
-        <translation type="obsolete">Nouvelle heure:</translation>
-    </message>
-    <message>
-        <source>Esimated Shift:</source>
-        <translation type="obsolete">Décalage estimé:</translation>
-    </message>
-    <message>
-        <source>Predicted Time:</source>
-        <translation type="obsolete">Heure calculée:</translation>
-    </message>
-    <message>
-        <source>Mean shift:</source>
-        <translation type="obsolete">Décalage moyen:</translation>
-    </message>
-    <message>
-        <source>Set predicted time</source>
-        <translation type="obsolete">Fixer la prévision de l&apos;heure</translation>
-    </message>
-    <message>
-        <source>Predict time</source>
-        <translation type="obsolete">Heure prévu</translation>
-    </message>
-    <message>
-        <source>Use</source>
-        <translation type="obsolete">Utiliser</translation>
-    </message>
-    <message>
-        <source>as</source>
-        <translation type="obsolete">comme</translation>
-    </message>
-    <message>
-        <source>NTP server to get the time from the network.</source>
-        <translation type="obsolete">serveur NTP pour obtenir la date et l&apos;heure.</translation>
-    </message>
-    <message>
-        <source>Wait for </source>
-        <translation type="obsolete">Attendre</translation>
-    </message>
-    <message>
-        <source>minutes until</source>
-        <translation type="obsolete">minute(s) avant</translation>
-    </message>
-    <message>
-        <source>NTP tries to syncronises the clock with the network.</source>
-        <translation type="obsolete">que NTP essaye de synchroniser l&apos;heure avec le réseau.</translation>
-    </message>
-    <message>
-        <source>Insure a delay of</source>
-        <translation type="obsolete">S&apos;assurer d&apos;un délai de</translation>
-    </message>
-    <message>
-        <source>a new NTP lookup will be used to predict the time.</source>
-        <translation type="obsolete">un nouvel appel à NTP sera utilisé pour prédire l&apos;heure.</translation>
-    </message>
-    <message>
-        <source>Set time</source>
-        <translation type="obsolete">Régler l&apos;heure</translation>
-    </message>
-    <message>
-        <source>Main</source>
-        <translation type="obsolete">Principal</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Manuel</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Paramètres</translation>
-    </message>
-    <message>
-        <source>Predict</source>
-        <translation type="obsolete">Prévoir</translation>
-    </message>
-    <message>
-        <source>NTP</source>
-        <translation type="obsolete">NTP</translation>
-    </message>
-    <message>
-        <source>Advanced settings</source>
-        <translation type="obsolete">Paramètres avancés</translation>
-    </message>
-</context>
-<context>
     <name>PredictTabWidget</name>
     <message>
         <source>Predicted time drift</source>
         <translation>dérive de l&apos;heure prévue</translation>
     </message>
     <message>
         <source>n/a</source>
         <translation>n/a</translation>
     </message>
     <message>
         <source>Estimated shift</source>
         <translation>Dérive estimée</translation>
@@ -387,102 +180,24 @@ ntpdate</translation>
     </message>
     <message>
         <source> s/h</source>
         <translation>s/h</translation>
     </message>
     <message>
         <source> seconds</source>
         <translation>Afficher les infos de prédiction
 de l&apos;heure</translation>
     </message>
 </context>
 <context>
-    <name>SetDateTime</name>
-    <message>
-        <source>Time Zone</source>
-        <translation type="obsolete">Zone</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Date</translation>
-    </message>
-    <message>
-        <source>Time format</source>
-        <translation type="obsolete">Format d&apos;heure</translation>
-    </message>
-    <message>
-        <source>24 hour</source>
-        <translation type="obsolete">24H</translation>
-    </message>
-    <message>
-        <source>12 hour</source>
-        <translation type="obsolete">12H</translation>
-    </message>
-    <message>
-        <source>Weeks start on</source>
-        <translation type="obsolete">Début semaine</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Dimanche</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lundi</translation>
-    </message>
-    <message>
-        <source>Date format</source>
-        <translation type="obsolete">Format de date</translation>
-    </message>
-    <message>
-        <source>Applet format</source>
-        <translation type="obsolete">Affichage barre</translation>
-    </message>
-    <message>
-        <source>hh:mm</source>
-        <translation type="obsolete">hh:mm</translation>
-    </message>
-    <message>
-        <source>D/M hh:mm</source>
-        <translation type="obsolete">J/M hh:mm</translation>
-    </message>
-    <message>
-        <source>M/D hh:mm</source>
-        <translation type="obsolete">M/J hh:mm</translation>
-    </message>
-    <message>
-        <source>System Time</source>
-        <translation type="obsolete">Paramètres Horaires</translation>
-    </message>
-</context>
-<context>
-    <name>SetTime</name>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">H.</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Min.</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">am</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">pm</translation>
-    </message>
-</context>
-<context>
     <name>SettingsTabWidget</name>
     <message>
         <source>Time server</source>
         <translation>Serveur NTP</translation>
     </message>
     <message>
         <source>minutes between time updates</source>
         <translation>minutes entre 2 synchronisations
 de l&apos;heure</translation>
     </message>
     <message>
         <source>minutes between prediction updates</source>
diff --git a/i18n/fr/tableviewer.ts b/i18n/fr/tableviewer.ts
index c6fea9f..c17aa52 100644
--- a/i18n/fr/tableviewer.ts
+++ b/i18n/fr/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Impossible de définir une valeur par défaut pour le type %1. Clé non ajoutée.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Pas de type valide trouvé</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Réinitialiser</translation>
     </message>
     <message>
         <source>key</source>
         <translation>Clé</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/fr/textedit.ts b/i18n/fr/textedit.ts
index 2cd1721..03bc192 100644
--- a/i18n/fr/textedit.ts
+++ b/i18n/fr/textedit.ts
@@ -146,30 +146,24 @@
         <source>Unnamed</source>
         <translation>Sans nom</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permissions</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Choisir une police</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">Voulez-vous réellement &lt;B&gt;supprimer&lt;/b&gt; le fichier courant
-du disque ?&lt;br&gt; C&apos;est &lt;b&gt;irréversible !!&lt;/b&gt;</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Oui</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Non</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>L&apos;éditeur de texte est sous copyrigth&lt;br&gt;2000 Trolltech AS, et &lt;BR&gt;2002 par &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt; et est sous license GPL</translation>
     </message>
     <message>
diff --git a/i18n/fr/tictac.ts b/i18n/fr/tictac.ts
index 9876e27..f2e38f7 100644
--- a/i18n/fr/tictac.ts
+++ b/i18n/fr/tictac.ts
@@ -1,22 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/fr/today.ts b/i18n/fr/today.ts
index 4b83807..bc9481e 100644
--- a/i18n/fr/today.ts
+++ b/i18n/fr/today.ts
@@ -6,28 +6,24 @@
         <source>Today</source>
         <translation type="unfinished">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 type="obsolete">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>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -44,92 +40,44 @@
     <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>
         <source>Move Up</source>
         <translation>Monter</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Descendre</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>Activer/Ordonner</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">Afficher automatique
-à l&apos;allumage ?
-(Opie seulement)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">minutes inactives</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Divers</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Vérifier si &quot;Aujourd&apos;hui&quot; doit-être lancer automatiquement au démarrage.</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Après combien de minutes de  veille du PDA la fonction &quot;Démarrage auto&quot; doit-elle être activée ?</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Taille de l&apos;icône</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Définir la taille de l&apos;icône en pixel</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Rafraîchir</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Périodicité des rafraîchissements de &quot;Aujourd&apos;hui&quot;</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">sec</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">jamais</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>Sélectionnez une case à cocher pour activer/désactiver un module ou utiliser les flèches de droite pour changer l&apos;ordre d&apos;apparition</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Config Aujourd&apos;hui</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
diff --git a/i18n/fr/todolist.ts b/i18n/fr/todolist.ts
index 5103f99..3630ba0 100644
--- a/i18n/fr/todolist.ts
+++ b/i18n/fr/todolist.ts
@@ -32,32 +32,24 @@
     <message>
         <source>Using template:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OTaskEditor</name>
     <message>
         <source>Alarms</source>
         <translation>Alarmes</translation>
     </message>
     <message>
-        <source>Reminders</source>
-        <translation type="obsolete">Rappels</translation>
-    </message>
-    <message>
-        <source>X-Ref</source>
-        <translation type="obsolete">X-Ref</translation>
-    </message>
-    <message>
         <source>Information</source>
         <translation>Information</translation>
     </message>
     <message>
         <source>Status</source>
         <translation>Etat</translation>
     </message>
     <message>
         <source>Recurrence</source>
         <translation>Récurrence</translation>
     </message>
     <message>
@@ -78,212 +70,124 @@
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Enter Task</source>
         <translation>Entrer une tâche</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Editer la tâche</translation>
     </message>
     <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Todolist</translation>
-    </message>
-    <message>
         <source>silent</source>
         <translation>Muette</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>Forte</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Nouvelle à partir d&apos;un modèle</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nouvelle tâche</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Cliquez ici pour créer une nouvelle tâche.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Editer la tâche</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Cliquez ici pour modifier la tâche courante.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Voir la tâche</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Supprimer...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Cliquez  ici pour effacer la tâche courante.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Supprimer tout...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Supprimer tâches terminées</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Transmettre</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Cliquez ici pour transmettre la tâche courante à un autre dispositif.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Rechercher</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Afficher les tâches terminées</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Montrer seulement les tâches échues</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Afficher les échéances</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Afficher la barre d&apos;outils</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Tâches</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Catégorie</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Options</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Edition rapide</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Voici la liste de toutes les tâches en cours.
 
 La liste affiche les informations suivantes:
 1. Terminé - Un marque verte indique une tâche terminée. Cliquer ici pour terminer un tâche.
 2. Priorité - Une représentation graphique de la priorité de la tâche. Double-cliquer ici pour la modifier.
 3. Description - Date d&apos;échéance de la tâche. This colonne peut être affichée ou cachée en séléctionnant Options-&gt;&apos;Montrer les dates d&apos;échéance&apos; à partir du menu ci-dessus.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Toutes les catégories</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Plus de place disponible</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>L&apos;application n&apos;a pas pu
 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 type="obsolete">Non classée</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 type="obsolete">Dupliquer</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorité</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Description</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Echéance</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
@@ -511,28 +415,24 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
         <source>Select category to organize this task with.</source>
         <translation>Selectionner la catégorie de la tâche.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Tâche récurrente</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Cliquez ici si cette tâches doit-être répétée. La fréquence est choisie dans l&apos;onglet de Répétition.</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notes : </translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Entrer des informations supplémentaires sur la tâche ici.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Liste des tâches</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Résumé : </translation>
     </message>
 </context>
@@ -654,118 +554,13 @@ Elle vous permet d&apos;ajouter rapidement une nouvelle tâche à votre liste. C
         <source>This is the name of the current task maintainer.</source>
         <translation>C&apos;est le nom du mainteneur actuel de la tâche.</translation>
     </message>
     <message>
         <source>test</source>
         <translation>test</translation>
     </message>
     <message>
         <source>Click here to select the task maintainer.</source>
         <translation>Cliquez ici pour sélectionner le mainteneur de la tâche.</translation>
     </message>
 </context>
-<context>
-    <name>TemplateDialog</name>
-    <message>
-        <source>Template Editor</source>
-        <translation type="obsolete">Editeur de Modèle</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Ajouter</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editer</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Effacer</translation>
-    </message>
-</context>
-<context>
-    <name>TemplateDialogImpl</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>New Template %1</source>
-        <translation type="obsolete">Nouveau Modèle %1</translation>
-    </message>
-</context>
-<context>
-    <name>Todo</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Plus</translation>
-    </message>
-    <message>
-        <source>Enter</source>
-        <translation type="obsolete">Valider</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuler</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="obsolete">Cliquer ici pour définir la prioriré 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>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="obsolete">Entrer la description de la nouvelle tâche ici.
-
-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>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="obsolete">Cliquer 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>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="obsolete">Cliquer 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>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="obsolete">Cliquer 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>
-</context>
 </TS>
diff --git a/i18n/fr/usermanager.ts b/i18n/fr/usermanager.ts
index 3285ea8..49b0a65 100644
--- a/i18n/fr/usermanager.ts
+++ b/i18n/fr/usermanager.ts
@@ -5,28 +5,24 @@
     <message>
         <source>Add Group</source>
         <translation>Ajouter un groupe</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Modifier un groupe</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">Gestion des Utilisateurs OPIE </translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Gestionnaire d&apos;utilisateurs Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Ajouter un utilisateur</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/fr/zsafe.ts b/i18n/fr/zsafe.ts
index 45aaee1..a186c02 100644
--- a/i18n/fr/zsafe.ts
+++ b/i18n/fr/zsafe.ts
@@ -1,275 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Voulez-vous effacer?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Effacer</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Ne pas effacer</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Modifier l&apos;entrée</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Identifiant</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Mot de passe</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Commentaire</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Champ 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Champ 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Nouvelle entrée</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Le nom de l&apos;entrée doit être
-différent de celui de la catégorie.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Rechercher</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Entrée non trouvée</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Champ 1</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Champ 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tous</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Texte</translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="obsolete">Supprimer fichier texte</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Impossible de supprimer le fichier texte.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="obsolete">Aucun document défini.
-Vous devez en créer un nouveau</translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="obsolete">Exporter vers un fichier texte</translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="obsolete">Importer un fichier texte</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Impossible d&apos;exporter vers un fichier texte.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Impossible d&apos;importer le fichier texte.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Saisir mot de passe</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Mot de passe incorrect
-
-ZSafe va s&apos;arrêter.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Mot de passe incorrect.
-Le saisir à nouveau?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Oui</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Non.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Document vide ou
-mot de passe incorrect.
-Continuer ?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Non</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Oui.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Le mot de passe est vide.
-Veuillez le saisir de nouveau.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Re-saisir mot de passe</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Les mots de passe doivent être identiques.
-Veuillez les saisir de nouveau.</translation>
-    </message>
-    <message>
-        <source>Do you want to save </source>
-        <translation type="obsolete">Voulez-vous enregistrer</translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="obsolete">
-avant de poursuivre ?</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Enregistrer</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Ne pas enregistrer</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Fichier de mot de passe sauvegardé.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Voulez-vous enregistrer
-avant de sortir ?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Enregistrer avec
-nouveau mot
-de &amp;Passe</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Catégorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Boîte d&apos;attente</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Rassemblement des icônes...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Créer nouveau document ZSafe</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="obsolete">Vous devez maintenant saisir
-deux fois le même mot de passe
-pour votre nouveau document.</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Ouvrir document ZSafe</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Enregistrer document ZSafe sous..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Gestionnaire Zaurus de mots de passe&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe version 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">par Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Traductions par Christophe Amrein-Marie et Michael Opdenacker&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe version 2.1.2&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Icône</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Champ 1</translation>
@@ -465,34 +204,24 @@ affiche la liste des répertoires et fichiers</translation>
     <message>
         <source>Please Wait...</source>
         <translation>Veuillez patienter...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Impossible de créer le répertoire
-%1
-
-ZSafe va s&apos;arrêter.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Enregistrer document</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Enregistrer document avec nouveau mot de &amp;passe</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>E&amp;xporter vers fichier texte</translation>
     </message>
     <message>
@@ -555,36 +284,24 @@ ZSafe va s&apos;arrêter.</translation>
         <source>&amp;About</source>
         <translation>&amp;A propos</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Nom</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Champ 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Champ 3</translation>
     </message>
     <message>
@@ -599,40 +316,32 @@ ZSafe va s&apos;arrêter.</translation>
         <source>Field 5</source>
         <translation>Champ 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Confirmez-vous la suppression ?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>Ne pas &amp;supprimer</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Editer entrée</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Identifiant</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Nouvelle entrée</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Les noms doivent être différents
 des noms de catégories.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Rechercher</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Entrée non trouvée</translation>
@@ -740,88 +449,40 @@ nouveau mot de passe</translation>
         <source>Category</source>
         <translation>Catégorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Dialogue d&apos;attente</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Chargement des icônes...</translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Gestionnaire mot de passe du Zaurus&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">par Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Traduit par Amrein-Marie Christophe&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Nouveau document</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Ouvrir document</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Enregistrer document sous..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Créer nouveau document ZSafe</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation>Ouvrir document ZSafe</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Enregistrer document ZSafe comme..</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.0&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe version 2.1.0&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Impossible de créer le répertoire
-.../Documents/application
-
-ZSafe va s&apos;arrêter.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Impossible de créer le répertoire
-.../Documents/application/zsafe
-
-ZSafe va s&apos;arrêter.</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation>Nouvelle entrée</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Modifier la catégorie ou l&apos;entrée</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Supprimer la catégorie ou l&apos;entrée</translation>
     </message>
     <message>
@@ -868,32 +529,24 @@ before continuing?</source>
         <translation>
 avant de poursuivre ?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Vous devez maintenant saisir
 deux fois le même mot de passe
 pour votre nouveau document.</translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe version 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe version 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/addressbook.ts b/i18n/hu/addressbook.ts
index b3ba141..4c9a3b8 100644
--- a/i18n/hu/addressbook.ts
+++ b/i18n/hu/addressbook.ts
@@ -19,136 +19,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Iktatatlan</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kapcsolatok</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Kapcsolat</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Új</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Szerkeszt</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Töröl</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Keres</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Levelet küld</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Bejegyzést átsugároz</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Személyes adataim</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Nézet</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Az adat nem szerkeszthető, szinkronizálás folyamatban</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Személyes adataim szerkesztése</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Cím szerkesztése</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kapcsolatok - Személyes adataim</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nincs hely</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nem lehet az információkat menteni.
 Szabadítson fel némi helyet
 és próbálja újra.
 
 Mégis kilép?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Iktatatlan</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">vCard importálása</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Keresés bezárása</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Minden adat mentése</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Beállítás</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Nem található</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Névjegyek</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Névjegy</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Keresés indítása</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Helyes fájltípus ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Igen</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nem</translation>
     </message>
     <message>
@@ -169,28 +93,24 @@ Tényleg meg akarja nyitni?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Tényleg hozzá akarja adni
 %1-t a kapcsolatokhoz?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Mind igen</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">vCard exportálása</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Ki kell választania egy kapcsolatot !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Meg kell adnia egy fájlnevet !</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/advancedfm.ts b/i18n/hu/advancedfm.ts
index 04ade79..2179f16 100644
--- a/i18n/hu/advancedfm.ts
+++ b/i18n/hu/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>Nem</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Megjegyzés</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Nem lehetett átnevezni</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Ez a könyvtár nem létezik</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Másolás, mint</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Fejlett Fájlmenedzser kimenet</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Fejlett Fájlmenedzser átsugárzás</translation>
     </message>
     <message>
@@ -129,138 +125,60 @@
         <source>Properties</source>
         <translation>Tulajdonságok</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Fájl átsugárzása</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Másolás ugyanebbe a könyvtárba</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Nem lehetett másolni
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">cél</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Nem lehetett áthelyezni</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Dokumentumokhoz adás</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Műveletek</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Mind kijelölése</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Valóban töröl
-%1 fájlt?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Törli a könyvtárat?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Valóban másol
-%1 fájlt?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>A fájl létezik!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-létezik. Felülírható?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">már létezik. Valóban törölni akarja?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 létezik. Felülírja?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">%1 nem másolható a %2 helyre</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">A Fejlett Fájlmenedzser
-szerzői joggal védett 2002-2003
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-a programot a GPL licensz védi
-fordítás: Bácsi László &lt;lackac@math.bme.hu&gt;</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Könyvjelzők</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Az aktuális könyvtár eltávolítása a könyvjelzők közül</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Az aktuális könyvtárt nem lehet törölni
-a könyvjelzők közül.
-Nincs ilyen könyvjelző!</translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation>Fájl keresés</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Valóban törli %1-t
-minden tartalmával együtt?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Valóban törli
-%1-t?</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Másolás</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Mint</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>Fejlett Fm ::</translation>
     </message>
     <message>
@@ -271,34 +189,24 @@ minden tartalmával együtt?</translation>
         <source>Switch to View 1</source>
         <translation>Váltás Nézet 1-re</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Váltás Nézet 2-re</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Még nincs implementálva</translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="obsolete">%1
-nem másolható a
-%2
-helyre</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/appearance.ts b/i18n/hu/appearance.ts
index 42ddda1..841a52e 100644
--- a/i18n/hu/appearance.ts
+++ b/i18n/hu/appearance.ts
@@ -130,36 +130,24 @@ Click here to select an available scheme.</source>
         <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="obsolete">Újraindít</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Igen</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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>
diff --git a/i18n/hu/clock.ts b/i18n/hu/clock.ts
index db262c5..7040523 100644
--- a/i18n/hu/clock.ts
+++ b/i18n/hu/clock.ts
@@ -31,72 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Szundít</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Óra</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Stopper</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Indulj</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Alaphelyzet</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Ébresztés beállítása</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Állj</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">DU</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Ébresztés bekapcsolva</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Ébresztés kikapcsolva</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Dátum és idő beállítása.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Óra: az ébresztést elmulasztotta.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -230,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Ébresztés beállítása</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Óra</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Perc</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">DE</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">DU</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Szundítási késleltetés
-(perc)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 ébresztés</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Mind</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Hang</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/hu/datebook.ts b/i18n/hu/datebook.ts
index 026dee5..cd1f150 100644
--- a/i18n/hu/datebook.ts
+++ b/i18n/hu/datebook.ts
@@ -333,24 +333,32 @@ Mégis kilép?</translation>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
@@ -536,28 +544,24 @@ Mégis kilép?</translation>
     <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="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>
diff --git a/i18n/hu/libbatteryapplet.ts b/i18n/hu/libbatteryapplet.ts
index 05a245c..1b9a30a 100644
--- a/i18n/hu/libbatteryapplet.ts
+++ b/i18n/hu/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Bezár</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>Töltés</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Elem hátrelévő élettartama</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Elem állapot:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Jó</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Alacsony</translation>
     </message>
     <message>
@@ -41,52 +33,36 @@
         <source>On backup power</source>
         <translation>Tartalékelemen</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Hálózati töltőn</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Külső áramellátás megszűnt</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Elem élettartamából hátra van</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Elem állapota</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Hiba</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nem tudom megnyitni a fájlt</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Mindkét eszközt töltöm</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Elem hátrelévő élettartama:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Elem élettartamából hátra van:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Nincs elemet tartalmazó kabát a gépen</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/libliquid.ts b/i18n/hu/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/hu/libliquid.ts
+++ b/i18n/hu/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/libopiepim2.ts b/i18n/hu/libopiepim2.ts
index 5987ffc..4e969bc 100644
--- a/i18n/hu/libopiepim2.ts
+++ b/i18n/hu/libopiepim2.ts
@@ -206,177 +206,24 @@ and </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>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Ismétlődő esemény</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nincs</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Nap</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Hét</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Hónap</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Év</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Minden:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Gyakoriság</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Vége:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Nincs végső dátum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ismétlés</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Hé</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ke</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sze</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Csü</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pé</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Szo</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Va</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Minden</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">HétVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Nincs végső dátum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ismétlés</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Hé</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ke</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sze</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Csü</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pé</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Szo</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Va</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Nap</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Minden</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Idő:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Válasszon időt:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/hu/libopieui2.ts b/i18n/hu/libopieui2.ts
index 17f7c36..a73b86d 100644
--- a/i18n/hu/libopieui2.ts
+++ b/i18n/hu/libopieui2.ts
@@ -1,152 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Ismétlődő esemény</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nincs</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Nap</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Hét</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Hónap</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Év</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Minden:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Gyakoriság</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Vége:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Nincs végső dátum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ismétlés</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Hé</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ke</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sze</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Csü</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pé</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Szo</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Va</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Minden</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">HétVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Nincs végső dátum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ismétlés</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Hé</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ke</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sze</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Csü</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pé</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Szo</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Va</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Nap</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Minden</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>
@@ -277,28 +139,24 @@
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Every</source>
-        <translation type="obsolete">Minden</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>
diff --git a/i18n/hu/libqpe.ts b/i18n/hu/libqpe.ts
index 9effd3a..0a3d676 100644
--- a/i18n/hu/libqpe.ts
+++ b/i18n/hu/libqpe.ts
@@ -185,28 +185,24 @@ már szerkeszti a kategóriákat.</translation>
     <message>
         <source>Find</source>
         <translation>Keres</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Szöveg nem található.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Végére értem, kezdem előről</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Keresés</translation>
     </message>
     <message>
@@ -442,32 +438,24 @@ Please free up some space
 before entering data</source>
         <translation>Nem tudom az induló fájlokat létrehozni
 Kérem szabadítson fel némi helyet
 mielőtt adatokat vinne be</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nem tudom az ébresztést beütemezni.
 Szabadítson fel némi memóriát és próbálja újra.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">H</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>É</translation>
     </message>
     <message>
         <source>day</source>
         <translation>nap</translation>
     </message>
     <message>
         <source>month</source>
         <translation>hónap</translation>
     </message>
     <message>
@@ -502,30 +490,24 @@ Szabadítson fel némi memóriát és próbálja újra.</translation>
         <source>Fri</source>
         <translation>Pé</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Szo</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Va</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Biztosan törli
-%1-t?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Mind</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Iktatatlan</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Munkahely címe:&lt;b&gt;</translation>
     </message>
     <message>
@@ -780,44 +762,24 @@ Szabadítson fel némi memóriát és próbálja újra.</translation>
         <source>Notes</source>
         <translation>Jegyzetek</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Csoportok</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>Új dokumentum</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Bökjön ide jelen ablak bezárásához és a változások elvetéséhez.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Bökjön ide jelen ablak bezárásához.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Bökjön ide jelen ablak bezárásához és a változások elmentéséhez.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Bökjön ide, hogy mozgathatóvá tegye ezt az ablakot.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Bökjön ide, hogy ez az ablak használjon minden elérhető képernyőterületet.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;Qt&gt;Ehhez az alkalmazáshoz nincs átfogó súgó, azonban összefüggés-érzékeny van.&lt;p&gt;Az összefüggés-érzékeny súgó használatához:&lt;p&gt;&lt;ol&gt;&lt;li&gt;bökjün a súgó gombra és tartsa.&lt;li&gt;amikor a &lt;b&gt;Mi ez...&lt;/b&gt; cím megjelenik, bökjön bármely vezérlőre.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">Mi ez...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -861,28 +823,24 @@ Szabadítson fel némi memóriát és próbálja újra.</translation>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Hiba</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">N</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">H</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/hu/libwlan.ts b/i18n/hu/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/hu/libwlan.ts
+++ b/i18n/hu/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/hu/opie-eye.ts b/i18n/hu/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/hu/opie-eye.ts
+++ b/i18n/hu/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/hu/opie-login.ts b/i18n/hu/opie-login.ts
index b35432a..ad59378 100644
--- a/i18n/hu/opie-login.ts
+++ b/i18n/hu/opie-login.ts
@@ -1,26 +1,22 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 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 type="obsolete">Ü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>
@@ -42,53 +38,36 @@ kereszteket a képernyőn.</translation>
 </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 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>
diff --git a/i18n/hu/opiemail.ts b/i18n/hu/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/hu/opiemail.ts
+++ b/i18n/hu/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/hu/qpe.ts b/i18n/hu/qpe.ts
index 54817e4..5fd2142 100644
--- a/i18n/hu/qpe.ts
+++ b/i18n/hu/qpe.ts
@@ -57,98 +57,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Applikáció probléma</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 nem válaszol.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Akarja, hogy bezárjam az alkalmazást?&lt;p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Érintse meg pontosan és határozottan
 a kereszteket a képernyő kalibrálásához.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Üdvözli önt az Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Dokumentumok</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Ikon nézet</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Listanézet</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Az elem szintje kritikus!
-Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">Az elem kezd kimerülni.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
-Kérem töltse fel a biztonsági-elemt.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">névjegykártya</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Információ</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
-(%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Elem állapot</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -230,107 +163,44 @@ Kérem töltse fel a biztonsági-elemt.</translation>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 fájl</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Minden fájltípus</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Dokumentum nézet</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Eszköz betéve</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">Egy &lt;b&gt;tároló eszközt&lt;/b&gt; helyezett a gépbe. Keressek rajta média fájlokat?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Mely média fájlokat</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Hang</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Kép</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Szöveg</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Videó</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Minden</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Csatold az alkalmazásokat</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Keresés korlátozása a könyvtárra: (még nem használt)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Hozzáad</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">A választása az eszközön lesz tárolva.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">Ennél az eszköznél ne kérdezze újra</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Mely média fájlokat</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Hang</translation>
@@ -364,31 +234,24 @@ Kérem töltse fel a biztonsági-elemt.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">Elem állapot</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -416,36 +279,24 @@ Kérem töltse fel a biztonsági-elemt.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Információ</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;A rendszer dátum nem tűnik helyesnek.
 (%1)&lt;/p&gt;&lt;p&gt;Akarja korrigálni az órát?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Az elem szintje kritikus!
-Tartsa kikapcsolva, amíg az áramellátás visszaáll!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">A biztonsági-elem szintje nagyon alacsony.
-Kérem töltse fel a biztonsági-elemt.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">névjegykártya</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -506,81 +357,59 @@ immediately.</source>
         <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="obsolete">&lt;p&gt;
-Ezeka bezárási lehetőségek elsősorban az Opie fejlesztése és tesztelése céljából vannak. Egy normális környezetben ezek feleslegesek.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Mégsem</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Leállítás...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Szinkronizációs kapcsolat</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha a Qtopia Desktop 1.5.1-es verziójánál régebbit használ, kérjük frissítsen.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished">Megtagad</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Egy jogosulatlan rendszer hozzáférést kér ehhez az eszközhöz.&lt;p&gt;Ha éppen most telepítette a Szinkronozálót először, ez normális.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Engedélyez</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Szinkronizálás</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Címlista&lt;b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Mégsem</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/hu/sysinfo.ts b/i18n/hu/sysinfo.ts
index 9ff6285..bddd9a6 100644
--- a/i18n/hu/sysinfo.ts
+++ b/i18n/hu/sysinfo.ts
@@ -142,40 +142,24 @@
         <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 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>
@@ -187,58 +171,48 @@ Memory is categorized as follows:
         <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>
-    </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>
     <message>
@@ -288,30 +262,24 @@ Bökjön a processzre és tartsa, hogy további információkat kapjon a process
         <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>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>
@@ -362,32 +330,24 @@ to this process?</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 type="obsolete">&lt;p&gt;Modell:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/hu/today.ts b/i18n/hu/today.ts
index 0430c71..b64399d 100644
--- a/i18n/hu/today.ts
+++ b/i18n/hu/today.ts
@@ -5,28 +5,24 @@
         <source>Today</source>
         <translation type="unfinished">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 type="obsolete">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>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -59,72 +55,28 @@
         <source>Move Up</source>
         <translation>Mozgasd fel</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mozgasd le</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktív/sorrend</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">Ébresztéskor
-automatikusan induljon?
-(Csak Opie esetén)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">perc iniaktivitás</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Vegyes</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Ikszelje be ha a Ma bekapcsoláskor el kell induljon.</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Hány percig kell a PDA-nak felfüggesztve lennie mielőtt az automatikus indítás létrejön bekapcsoláskor</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Ikon méret</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Az ikon méretét állítja be pixelben</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Frissítés</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Milyen gyakran frissítse a Ma önmagát</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">másodperc</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">soha</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>Ikszelje be a négyzetet a kiegészítő aktiválásához vagy használja a jobboldali nyilakat a sorrend beállításához</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
diff --git a/i18n/hu/todolist.ts b/i18n/hu/todolist.ts
index c934f83..619c222 100644
--- a/i18n/hu/todolist.ts
+++ b/i18n/hu/todolist.ts
@@ -80,198 +80,114 @@
     <message>
         <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Új sablonból</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Új feladat</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Bökjön ide új feladat létrehozásához.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Feladat szerkesztése</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Bökjön ide az aktuális feladat módosításához.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Feladat megnézése</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Töröl...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Bökjön ide az aktuális feladat eltávolításához.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Mindent töröl...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation type="unfinished">Elvégzettek törlése</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Átsugárzás</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Bökjön ide az aktuális felada másik eszköznek küldéséhez.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Keresés</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished">Mutasd az elvégzett feladatokat</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished">Csak a lejárt feladatokat mutasd</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished">Mutasd a feladatok határidejét</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished">Mutasd a gyors feladatcsíkot</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Adat</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategória</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Beállítások</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished">GyorsSzerkesztés</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished">Ez az összes aktuális feladat listája.
 
 A lista az alábbi információkat tartalmazza:
 1. Teljesített -  Egy zöld pipa jelzi a feladat teljesítését. Bökjön ide, ha teljesítette a feladatot.
 2. Fontosság - grafikus megjelenítése a feladat fontosságának. Duplán bökjön ide a módosításhoz.
 3. Leírás - a feladat leírása. Bökjön ide a feladat kiválasztásához.
 4. Határidő - megmutatja mikorra kell készlegyen a feladattal. Ez az oszlop mutatható vagy elrejthető a Beállítások-&gt;&apos;Mutasd a feladatok határidejét&apos; kiválasztásával a fenti menüből.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Minden kategória</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished">Nincs hely</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">A Teendők nem tudta elmenteni
 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="obsolete">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="obsolete">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="obsolete">Leírás</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation type="unfinished">Határidő</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
@@ -499,28 +415,24 @@ Lehetővé teszi, hogy gyorsan felvegyen új feladatokat a listába. Ez a terül
         <source>Select category to organize this task with.</source>
         <translation>Válassza ki a kategóriát, melyhez a feladat tartozik.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Ismétlődő feladat</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Bökjön ide, ha a feladat rendszeresen esedékes. Ha kiválasztja, a rendszerességet beállíthatja a Rendszeresség fülön.</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Jegyzetek:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Írjon be bármi kiegészítő információt a feladatról ide.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Teendők listája</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/hu/zsafe.ts b/i18n/hu/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/hu/zsafe.ts
+++ b/i18n/hu/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/it/addressbook.ts b/i18n/it/addressbook.ts
index 4999dd0..b3aa0b0 100644
--- a/i18n/it/addressbook.ts
+++ b/i18n/it/addressbook.ts
@@ -20,136 +20,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Vuota</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contatti</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Contatto</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nuovo</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Modifica</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Cancella</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Trova</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Scrivi Email A</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Trasmetti via IrDA</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importa vCard</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Informazioni Personali</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Vista</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossibile modificare i dati, sincronizzazione in corso</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Modifica Dati Personali</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Modifica Dati</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatti - Dati Personali</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Spazio Esaurito</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossibile salvare i dati.
 Liberare dello spazio
 e riprovare.
 
 Uscire comunque?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Vuota</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Cartellini</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Chiudi Trova</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Salva tutti i Dati</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Configurazione</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Non Trovato</translation>
     </message>
     <message>
-        <source>Card</source>
-        <translation type="obsolete">Cartellino</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Inizia Ricerca</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Giusto tipo di file?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sì</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;No</translation>
     </message>
     <message>
@@ -171,28 +95,24 @@ Uscire comunque?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Vuoi veramente aggiungere un contatto per 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Tutti Sì</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Esporta vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Devi selezionare un contatto !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Devi impostare un nome file !</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1386,180 +1306,13 @@ rilasciato gratuitamente!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Esporta vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Informazioni Personali</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Tel. Lavoro</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax Lavoro</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Cell. Lavoro</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Email Principale</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Altre Email</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Tel. Abitazione</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax Abitazione</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Cell. Abitazione</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Lavoro</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Professione</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistente</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Direttore</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Coniuge</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Sesso</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Compleanno</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Anniversario</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Alias</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Figli</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Titolo</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Secondo Nome</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Cognome</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffisso</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Visualizza come</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Titolo</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Dipartimento</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Società</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Indirizzo Lavoro</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Città Lavoro</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Stato Lavoro</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">CAP Lavoro</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Paese Lavoro</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Cercapersone Lavoro</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Pagina Web Lavoro</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Indirizzo Abitazione</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Città Abitazione</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Stato Abitazione</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">CAP Abitazione</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Paese Abitazione</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Pagina Web Abitazione</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Note</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/it/advancedfm.ts b/i18n/it/advancedfm.ts
index c01054e..dba8dd9 100644
--- a/i18n/it/advancedfm.ts
+++ b/i18n/it/advancedfm.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Note</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">La directory non esiste</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Mostra File Nascosti</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Esegui</translation>
     </message>
     <message>
         <source>Open as text</source>
         <translation>Apri come testo</translation>
     </message>
     <message>
@@ -90,32 +86,24 @@
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Vista</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Esegui Comando con Output</translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="obsolete">Cambia su Locale</translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="obsolete">Cambia su Remoto</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Dimensione</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
@@ -126,160 +114,80 @@
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Impossibile rinominare</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Impossibile copiare
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">to
-</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Copia </translation>
     </message>
     <message>
         <source> As</source>
         <translation> Come</translation>
     </message>
     <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Impossibile spostare
-</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>Output AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Trasmissione Advancedfm</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir eseguito.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-copyright 2002-2003 di
-L.J.Potter &lt;llornkcor@handhelds.org&gt;
-sotto licenza GPL</translation>
-    </message>
-    <message>
         <source>Change Directory</source>
         <translation>Cambia Directory</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Seleziona Tutto</translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation>Directory Bookmark</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Elimina Directory Corrente dai Bookmarks</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Vuoi realmente cancellare
-%1 file?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Cancella Directory?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Copiare realmente
-%1 file?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>File Esistente!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 esiste. Ok per sovrascrivere?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Impossibile copiare %1 su %2</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-esiste. Ok per sovrascrivere?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete"> già esiste.
-Vuoi veramente eliminarlo?</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">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 type="obsolete">Vuoi veramente eliminare %1
-e tutto il suo contenuto ?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">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>
diff --git a/i18n/it/appearance.ts b/i18n/it/appearance.ts
index c33fb3b..f0fa849 100644
--- a/i18n/it/appearance.ts
+++ b/i18n/it/appearance.ts
@@ -62,64 +62,24 @@ Premi qui per selezionare uno schema disponibile.</translation>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Premi qui per eliminare lo schema dei colori selezionato dalla lista sulla sinistra.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Salva</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Premi qui per nominare e salvare lo schema dei colori corrente.</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Forza lo stile per tutte le applicazioni.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Premi qui per permettere a tutte le applicazioni di poter utilizzare le impostazioni globali.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Disabilita lo stile per queste applicazioni (&lt;b&gt;*&lt;/b&gt; può essere utilizzato come una wildcard):</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Se alcune applicazioni non vengono visualizzate correttamente con le impostazioni globali, si possono disabilitare alcune impostazioni per quell&apos;applicazione.
-
-Quest&apos;area permette di selezionare un&apos;applicazione e quali impostazioni si vuole disabilitare.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">File Binari</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Premi qui per aggiungere un&apos;applicazione nella lista superiore.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Premi qui per eliminare l&apos;applicazione selezionata.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Premi qui per spostare sù nella lista l&apos;applicazione selezionata.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Premi qui per spostare giù nella lista l&apos;applicazione selezionata.</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Stile tab:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Premi qui per selezionare lo stile desiderato per le finestre di dialogo (come quest&apos;applicazione). Gli stili disponibili sono:
 
@@ -184,64 +144,44 @@ Quest&apos;area permette di selezionare un&apos;applicazione e quali impostazion
         <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 type="obsolete">Riavvia</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Vuoi riavviare %1 ora?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&lt;nuovo&gt;</translation>
-    </message>
-    <message>
         <source>Show Scrollbars on the left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
diff --git a/i18n/it/aqpkg.ts b/i18n/it/aqpkg.ts
index 5d5030d..638298f 100644
--- a/i18n/it/aqpkg.ts
+++ b/i18n/it/aqpkg.ts
@@ -199,56 +199,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Impossibile aprire file di stato - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Impossibile creare file di stato temporaneo - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Impossibile avviare processo ipkg</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Impossibile aprire :</translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Creazione directory </translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Creato link da %1 a %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Creazione link da %1 a %2 fallita</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Eliminato %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Impossibile eliminare %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Eliminato </translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Impossibile eliminare </translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
@@ -510,42 +478,34 @@ Sei sicuro?
         <translation>Vuoi eliminare o rinstallare
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Elimina o Rinstalla</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Rinstalla</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Vuoi eliminare o fare l&apos;upgrade di
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Elimina o Upgrade</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">U</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Aggiornamento...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Descrizione&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/it/backup.ts b/i18n/it/backup.ts
index e19c063..86b7d65 100644
--- a/i18n/it/backup.ts
+++ b/i18n/it/backup.ts
@@ -1,21 +1,17 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Backup e Restore... in corso...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Backup e Restore</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Errore dal Sistema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Messaggio</translation>
@@ -28,44 +24,36 @@
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Dettagli</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Backup e Restore... Fallito !!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Backup Eseguito.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Seleziona qualcosa da restorare.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Restore Fallito.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Impossibile aprire File: %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Restore Eseguito.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -99,52 +87,44 @@
         <source>Backup And Restore</source>
         <translation>Backup e Restore</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Applicazioni</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Salva Su</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Backup</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restore</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Seleziona Sorgente</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Colonna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Restore</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Aggiorna Lista File</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/it/calculator.ts b/i18n/it/calculator.ts
index f962aed..a37db43 100644
--- a/i18n/it/calculator.ts
+++ b/i18n/it/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Calcolatrice Sperimentale</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -123,28 +119,24 @@
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calcolatrice</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standard</translation>
     </message>
-    <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/it/calibrate.ts b/i18n/it/calibrate.ts
index 93e6c73..812248d 100644
--- a/i18n/it/calibrate.ts
+++ b/i18n/it/calibrate.ts
@@ -1,16 +1,12 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Tocca le crocette accuratamente e
 con decisione per calibrare lo schermo.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Benvenuto in Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/it/checkbook.ts b/i18n/it/checkbook.ts
index 71e1714..61a6ef1 100644
--- a/i18n/it/checkbook.ts
+++ b/i18n/it/checkbook.ts
@@ -30,48 +30,24 @@
         <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 type="obsolete">Risparmio</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Deposito</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Mercato finanziario</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Mutuo</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -94,32 +70,24 @@
         <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 type="obsolete">Saldo: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -174,28 +142,24 @@ Per ordinarla per un campo specifico, Premi sul nome della colonna.</translation
         <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 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>
@@ -647,109 +611,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Automobile</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Conti</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Vestiti</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Computer</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVD</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Elettronica</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Intrattenimento</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Cibo</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Carburante</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Varie</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Film</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Affitto</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="obsolete">Viaggio</translation>
-    </message>
-    <message>
         <source>Debit Charge</source>
         <translation>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 type="obsolete">Lavoro</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Parente</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <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 type="obsolete">Elettronica</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/it/clock.ts b/i18n/it/clock.ts
index 324a12d..addfa92 100644
--- a/i18n/it/clock.ts
+++ b/i18n/it/clock.ts
@@ -32,76 +32,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Snooze</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Orologio</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Cronografo</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Inizia</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Imposta Allarme</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Imposta data ed orario.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Allarme Inserito</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Allarme Disinserito</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Fine</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Orologio: Allarme mancante.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Allarme impostato: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -235,55 +195,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Imposta Allarme</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Ora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuti</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">allarme mp3</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Ritardo
-Snooze
-(minuti)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tutti</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/it/datebook.ts b/i18n/it/datebook.ts
index 9915c6e..e81f848 100644
--- a/i18n/it/datebook.ts
+++ b/i18n/it/datebook.ts
@@ -334,24 +334,32 @@ Uscire comunque?</translation>
     <message>
         <source>Office</source>
         <translation>Ufficio</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Abitazione</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Categoria:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -407,59 +415,24 @@ Uscire comunque?</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>
-        <comment>Friday</comment>
-        <translation type="obsolete">Ven</translation>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Dom</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Inizio</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Fine</translation>
     </message>
     <message>
@@ -572,28 +545,24 @@ Uscire comunque?</translation>
     <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="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>
diff --git a/i18n/it/embeddedkonsole.ts b/i18n/it/embeddedkonsole.ts
index f513f06..33a3697 100644
--- a/i18n/it/embeddedkonsole.ts
+++ b/i18n/it/embeddedkonsole.ts
@@ -1,115 +1,67 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Sezione Comandi</translation>
     </message>
-    <message>
-        <source>new</source>
-        <translation type="obsolete">nuovo</translation>
-    </message>
-    <message>
-        <source>edit</source>
-        <translation type="obsolete">modifica</translation>
-    </message>
-    <message>
-        <source>delete</source>
-        <translation type="obsolete">elimina</translation>
-    </message>
-    <message>
-        <source>up</source>
-        <translation type="obsolete">sù</translation>
-    </message>
-    <message>
-        <source>down</source>
-        <translation type="obsolete">giù</translation>
-    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Comandi</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Comandi Suggeriti&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminale</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Micro</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Piccolo</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Medio</translation>
-    </message>
-    <message>
         <source>Command List</source>
         <translation>Lista Comandi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Visualizza lista comandi</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Nascondi lista comandi</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Tab in Fondo</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Verde su Nero</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Nero su Bianco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bianco su Nero</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Nero su Trasparente</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Nero su Rosso</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rosso su Nero</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Verde su Giallo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blu su Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta su Blu</translation>
     </message>
     <message>
@@ -128,32 +80,24 @@
         <source>Amber on Black</source>
         <translation>Ambra su Nero</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Personalizzato</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Colori</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Font</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opzioni</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nuovo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spazio</translation>
     </message>
     <message>
@@ -168,28 +112,24 @@
         <source>Down</source>
         <translation>Giù</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Incolla</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Modifica</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Disattiva</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Sinistra</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Destra</translation>
     </message>
     <message>
@@ -204,28 +144,24 @@
         <source>Hide Command List</source>
         <translation>Nascondi Lista Comandi</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>A Capo</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Usa Beep</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Tabs Sopra</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/it/fifteen.ts b/i18n/it/fifteen.ts
index c3cd912..17e2495 100644
--- a/i18n/it/fifteen.ts
+++ b/i18n/it/fifteen.ts
@@ -52,28 +52,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Randomizza</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Risolvi</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Partita</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Gioco del 15</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/formatter.ts b/i18n/it/formatter.ts
index 89ddfbe..25df914 100644
--- a/i18n/it/formatter.ts
+++ b/i18n/it/formatter.ts
@@ -14,76 +14,50 @@
         <source>File Systems</source>
         <translation>File System</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatta</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Principale</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">ATTENZIONE:
-Cambiare i parametri su questa 
-pagina può causare il non corretto 
-funzionamento del tuo sistema!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Modifica fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Controlla Disco</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Device</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Mount Point</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Avanzate</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Formatto?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Formatto veramente
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-con </translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete"> filesystem?!?
-Perderai tutti i dati!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Impossibile formattare.
 Tipo sconosciuto</translation>
@@ -120,50 +94,36 @@ Device occupato!</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Nessun device!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 è stato formattato con successo.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Tento di montare.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Mount Card fallito!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-è stato montato con successo.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Ora puoi chiudere la finestra di output.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Interno</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Tipo Storage : </translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Totali: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Usati: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/it/go.ts b/i18n/it/go.ts
index 97d415c..c6bec7b 100644
--- a/i18n/it/go.ts
+++ b/i18n/it/go.ts
@@ -40,18 +40,14 @@
     <message>
         <source>A draw.</source>
         <translation>Pareggio.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Passo</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prigionieri: nero %1, bianco %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Via</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/it/kbill.ts b/i18n/it/kbill.ts
index c0439c5..4673337 100644
--- a/i18n/it/kbill.ts
+++ b/i18n/it/kbill.ts
@@ -26,28 +26,24 @@
         <source>&amp;File</source>
         <translation>&amp;File</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pausa</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;La Storia&lt;/b&gt;&lt;p&gt;Ancora una volta, il destino del mondo è nelle tue mani!  Un hacker malvagio, conosciuto solo con l&apos;alias di &apos;Bill&apos;, ha creato il virus informatico definito.  Un virus così potente che può trasformare un normale computer in un tostapane. Bill ha clonato se stesso in milioni/miliardi di micro-Bill. Il loro unico scopo è quello di trasmettere il malvagio virus, che è stato astutamente camuffato come un famoso sistema operativo. Come Amministratore di Sistema e Sterminatore, il tuo compito è di fermare il malvagio piano di Bill .</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>La storia di KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Le regole di KBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;Le Regole&lt;/b&gt;&lt;p&gt;kBill è stato scrupolosamente disegnato in modo da essere facilemente utilizzato da tutta la famiglia. Anni - anzi - giorni di beta testing e di consultazioni con i più economici sviluppatori di interfacce grafiche hanno portato a sviluppare un gioco facile da usare, ma niente a che vedere con un Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Schiaccia i Bill (premi)&lt;/LI&gt;&lt;LI&gt;Riavvia il computer (premi)&lt;/LI&gt;&lt;LI&gt;Riprendi i SO rubati e riportali (trascinandoli) sui rispettivi computer&lt;/LI&gt;&lt;LI&gt;Trascina il secchio per spegnere le scintille&lt;/LI&gt;&lt;LI&gt;Il punteggio è basato sul tempo totale, con bonus per l&apos;uccisione dei Bill.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Per tutto il resto, riuscirai sicuramente a farlo funzionare da solo.  Noi lo abbiamo fatto, quindi non può essere troppo difficile</translation>
     </message>
     <message>
diff --git a/i18n/it/keypebble.ts b/i18n/it/keypebble.ts
index 58b6d9a..ba327ad 100644
--- a/i18n/it/keypebble.ts
+++ b/i18n/it/keypebble.ts
@@ -21,28 +21,24 @@ connection.</source>
         <translation>Errore in Lettura: QSocket ha trovato un errore leggendo
 i dati, l&apos;host remoto ha probabilmente chiuso la
 connessione.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket ha trovato un codice di errore invalido</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">In attesa per inizializzazione server...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>In attesa per nome desktop...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Connesso a %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Errore di Protocollo: Trovato Id Messaggio %1 mentre si attendeva un messaggio di aggiornamento.</translation>
     </message>
     <message>
diff --git a/i18n/it/launchersettings.ts b/i18n/it/launchersettings.ts
index 0ecb267..a88729c 100644
--- a/i18n/it/launchersettings.ts
+++ b/i18n/it/launchersettings.ts
@@ -204,52 +204,44 @@
         <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 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 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>
diff --git a/i18n/it/libbatteryapplet.ts b/i18n/it/libbatteryapplet.ts
index 11c21a9..4f4afba 100644
--- a/i18n/it/libbatteryapplet.ts
+++ b/i18n/it/libbatteryapplet.ts
@@ -1,29 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Chiudi</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>In carica</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Percentuale batteria rimasta</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Stato batteria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Buono</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Basso</translation>
     </message>
     <message>
@@ -42,52 +34,36 @@
         <source>On backup power</source>
         <translation>Carica di riserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Alimentazione esterna inserita</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Alimentazione esterna disinserita</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Tempo batteria rimasto</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Stato Batteria</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>impossibile aprire il file</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>In carica entrambi gli apparecchi</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Percentuale batteria rimasta:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Tempo batteria rimasto:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Jacket con batteria non inserito</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/it/libkppp.ts b/i18n/it/libkppp.ts
index c74f27d..29802cd 100644
--- a/i18n/it/libkppp.ts
+++ b/i18n/it/libkppp.ts
@@ -1,64 +1,44 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>AccountWidget</name>
     <message>
-        <source>&amp;Edit...</source>
-        <translation type="obsolete">&amp;Modifica...</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected account</source>
         <translation>Permette di modificare l&apos;account selezionato</translation>
     </message>
     <message>
-        <source>&amp;New...</source>
-        <translation type="obsolete">&amp;Nuovo...</translation>
-    </message>
-    <message>
         <source>Create a new dialup connection
 to the Internet</source>
         <translation>Crea una nuova connessione dialup
 verso Internet</translation>
     </message>
     <message>
-        <source>Co&amp;py</source>
-        <translation type="obsolete">Co&amp;pia</translation>
-    </message>
-    <message>
         <source>Makes a copy of the selected account. All
 settings of the selected account are copied
 to a new account, that you can modify to fit your
 needs</source>
         <translation>Crea una copia dell&apos;account selezionato. Tutte le
 impostazioni dell&apos;account selezionato saranno copiate
 nel nuovo account, che potrai modificare liberamente</translation>
     </message>
     <message>
-        <source>De&amp;lete</source>
-        <translation type="obsolete">Cance&amp;lla</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Deletes the selected account
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;p&gt;Cancella l&apos;account selezionato
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Usa con cautela!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <source>Maximum number of accounts reached.</source>
-        <translation type="obsolete">Raggiunto numero massimo di account.</translation>
-    </message>
-    <message>
         <source>No account selected.</source>
         <translation>Nessun account selezionato.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the account &quot;%1&quot;?</source>
         <translation>Sei sicuro di voler cancellare
 l&apos;account &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Conferma</translation>
@@ -110,40 +90,24 @@ l&apos;account &quot;%1&quot;?</translation>
     <message>
         <source>Execute Programs</source>
         <translation>Esegui Programmi</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Esegui</translation>
     </message>
     <message>
         <source>You must enter a unique account name</source>
         <translation>Devi inserire un nome account univoco</translation>
     </message>
-    <message>
-        <source>Byte</source>
-        <translation type="obsolete">Byte</translation>
-    </message>
-    <message>
-        <source>KB</source>
-        <translation type="obsolete">KB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="obsolete">GB</translation>
-    </message>
 </context>
 <context>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
         <translation>Autenticazione: </translation>
     </message>
     <message>
         <source>Script-based</source>
         <translation>Basato-su-script</translation>
     </message>
     <message>
@@ -353,51 +317,24 @@ some circumstances.</source>
 DNS specificati in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; saranno
 temporaneamente disabilitati durante la connessione
 dialup. Dopo che la connessione sarà terminata, i server
 saranno riabilitati.
 
 Normalmente, non c&apos;è alcuna ragione per utilizzare
 questa opzione, ma può tornare utile in certe circostanze.</translation>
     </message>
 </context>
 <context>
     <name>DevicesWidget</name>
     <message>
-        <source>Allows you to modify the selected account</source>
-        <translation type="obsolete">Permette di modificare l&apos;account selezionato</translation>
-    </message>
-    <message>
-        <source>Create a new dialup connection
-to the Internet</source>
-        <translation type="obsolete">Crea una nuova connessione dialup
-verso Internet</translation>
-    </message>
-    <message>
-        <source>Makes a copy of the selected account. All
-settings of the selected account are copied
-to a new account, that you can modify to fit your
-needs</source>
-        <translation type="obsolete">Crea una copia dell&apos;account selezionato. Tutte le
-impostazioni dell&apos;account selezionato saranno copiate
-nel nuovo account, che potrai modificare liberamente</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Deletes the selected account
-
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Cancella l&apos;account selezionato
-
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Usa con cautela!&lt;/b&gt;&lt;/font&gt;</translation>
-    </message>
-    <message>
         <source>No devices selected.</source>
         <translation>Nessun dispositivo selezionato.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the device &quot;%1&quot;?</source>
         <translation>Sei sicuro di voler cancellare il
 dispositivo &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Conferma</translation>
@@ -410,28 +347,24 @@ dispositivo &quot;%1&quot;?</translation>
         <source>Edit Device: </source>
         <translation>Modifica Dispositivo: </translation>
     </message>
     <message>
         <source>&amp;Device</source>
         <translation>&amp;Dispositivo</translation>
     </message>
     <message>
         <source>&amp;Modem</source>
         <translation>&amp;Modem</translation>
     </message>
     <message>
-        <source>You must enter a unique account name</source>
-        <translation type="obsolete">Devi inserire un nome account univoco</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected device</source>
         <translation>Permette di modificare il dispositivo selezionato</translation>
     </message>
     <message>
         <source>Create a new device</source>
         <translation>Crea un nuovo dispositivo</translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
@@ -1002,32 +935,24 @@ essere utile per configurare il modem</translation>
         <source>Modem failure</source>
         <translation>Errore Modem</translation>
     </message>
     <message>
         <source>A critical failure appeard while testing the modem</source>
         <translation>Testando il modem si è verificato un errore</translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
         <translation>&amp;Account</translation>
     </message>
     <message>
-        <source>&amp;Device</source>
-        <translation type="obsolete">&amp;Dispositivo</translation>
-    </message>
-    <message>
-        <source>&amp;Modem</source>
-        <translation type="obsolete">&amp;Modem</translation>
-    </message>
-    <message>
         <source>&amp;Devices</source>
         <translation>&amp;Dispositivi</translation>
     </message>
 </context>
 <context>
     <name>PPPdArguments</name>
     <message>
         <source>Customize pppd Arguments</source>
         <translation>Modifica opzioni pppd</translation>
     </message>
     <message>
         <source>Argument:</source>
@@ -1486,31 +1411,24 @@ Chiedi all&apos;amministratore di sistema di creare il file (può essere vuoto)
         <translation>&lt;qt&gt;Hai selezionato l&apos;autenticazione di tipo PAP o CHAP. Questa richiede di inserire una username ed una password!&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Impossibile creare file &quot;%1&quot;&lt;br&gt;per autenticazione PAP/CHAP&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>You must specify a telephone number!</source>
         <translation>Devi inserire un numero telefonico!</translation>
     </message>
 </context>
 <context>
-    <name>QObject::ModemWidget</name>
-    <message>
-        <source>Modem timeout:</source>
-        <translation type="obsolete">Timeout Modem:</translation>
-    </message>
-</context>
-<context>
     <name>ScriptWidget</name>
     <message>
         <source>Add</source>
         <translation>Aggiungi</translation>
     </message>
     <message>
         <source>Insert</source>
         <translation>Inserisci</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Rimuovi</translation>
diff --git a/i18n/it/libliquid.ts b/i18n/it/libliquid.ts
index 4fa8cd2..4f54445 100644
--- a/i18n/it/libliquid.ts
+++ b/i18n/it/libliquid.ts
@@ -1,76 +1,69 @@
 <!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 type="unfinished">Stile Liquid</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">No trasparenza</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Colore sfondo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Colore pulsante</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Colore sfondo trasparente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Colore pulsante trasparente</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Trasparenza personalizzata</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Colore menu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Colore testo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Opacità</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Usa testo menu ombreggiato</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Pulsanti barra applicazioni senza rilievo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Contrasto</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Stile Liquid ad alte performance di Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libopiepim2.ts b/i18n/it/libopiepim2.ts
index 6db5400..3425abb 100644
--- a/i18n/it/libopiepim2.ts
+++ b/i18n/it/libopiepim2.ts
@@ -1,165 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Pulsante Agenda</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Pulsante ontatti</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Pulsante Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Pulsante Posta</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Pulsante Home</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Pulsante Registrazione</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotazione Display</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Basso+Sù</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Basso+Giù</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Basso+Destra</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Basso+Sinistra</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Alto+Sù</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Alto+Giù</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Alto+Destra</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Alto+Sinistra</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Tinta:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rosso:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blu:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Alpha channel:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Seleziona colore</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Ancora</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Ancora...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Medio</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Piccolo</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Ripetuto</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nessuno</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Giorno</translation>
@@ -358,255 +208,24 @@ e </translation>
         <translation type="unfinished">mese(i)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">anno(i)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Ogni</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Evento Ripetuto</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nessuno</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Giorno</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Settimana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mese</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Anno</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Ogni:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequenza</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Fine Il:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Indefinitivamente</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ripeti Su</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mer</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Gio</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ven</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Ogni</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Indefinitivamente</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">giorni</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">giorno</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">settimane</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">settimana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">mesi</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mese</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">anni</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">anno</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">e</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-e </translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, e </translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Mai</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">giorno(i)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ripeti Il</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mer</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Gio</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ven</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">settimana(e)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Ripeti Per</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Giorno</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mese(i)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">anno(i)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Ogni</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">su</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Orario:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Scegli l&apos;Orario:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -660,84 +279,46 @@ e </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FileDialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Apri</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Salva</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stile</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <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>
@@ -840,28 +421,24 @@ e </translation>
         <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 type="obsolete">Il %1 %1 di ogni</translation>
-    </message>
-    <message>
         <source>Every </source>
         <translation>Ogni </translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Lunedì</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Martedì</translation>
     </message>
     <message>
@@ -876,36 +453,24 @@ e </translation>
         <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>Documents</source>
-        <translation type="obsolete">Documenti</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">File</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -920,32 +485,24 @@ e </translation>
         <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 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 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>
diff --git a/i18n/it/libopieui2.ts b/i18n/it/libopieui2.ts
index df08e5c..7655487 100644
--- a/i18n/it/libopieui2.ts
+++ b/i18n/it/libopieui2.ts
@@ -1,419 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Pulsante Agenda</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Pulsante ontatti</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Pulsante Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Pulsante Posta</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Pulsante Home</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Pulsante Registrazione</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotazione Display</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Basso+Sù</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Basso+Giù</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Basso+Destra</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Basso+Sinistra</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Alto+Sù</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Alto+Giù</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Alto+Destra</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Alto+Sinistra</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Tinta:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rosso:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blu:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Alpha channel:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Seleziona colore</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Ancora</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Ancora...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FileDialog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Apri</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Salva</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Medio</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Piccolo</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stile</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Cantami o Diva del pelide Achille l&apos;ira funesta</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Nome</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Evento Ripetuto</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nessuno</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Giorno</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Settimana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mese</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Anno</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Ogni:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequenza</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Fine Il:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Indefinitivamente</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ripeti Su</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mer</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Gio</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ven</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Ogni</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Indefinitivamente</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">giorni</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">giorno</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">settimane</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">settimana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">mesi</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mese</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">anni</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">anno</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">e</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-e </translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, e </translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Mai</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">giorno(i)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ripeti Il</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Lun</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Mar</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Mer</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Gio</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Ven</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">settimana(e)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Ripeti Per</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Giorno</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mese(i)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">anno(i)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Ogni</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -542,305 +138,39 @@ e </translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Dimensione</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo Mime</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Description:</source>
-        <translation type="obsolete">Descrizione:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Priorità:</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Avanzamento:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Scadenza:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">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 type="obsolete">Telefono Casa: </translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Fax Casa: </translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Cellulare Casa: </translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Pagina Web Casa: </translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Pagina Web Ufficio: </translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Ufficio: </translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Telefono Ufficio: </translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Fax Ufficio: </translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Cellulare Ufficio: </translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Cercapersone Ufficio: </translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Professione: </translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistente: </translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Direttore: </translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Maschile</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Femminile</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Sesso: </translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Coniuge: </translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Compleanno: </translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Anniversario: </translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Alias: </translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Email Principale: </translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Tutte le Email: </translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Figli: </translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Note:</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Inizio:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Fine:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Nota:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Ogni</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 ogni </translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">Il %1 ogni </translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">Il %1 %1 di ogni</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Ogni </translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Lunedì</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Martedì</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Mercoledì</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Giovedì</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Venerdì</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Sabato</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">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 type="obsolete">Molto alta</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Alta</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normale</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Bassa</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Molto bassa</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Ubicazione:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Evento per tutto il giorno</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Evento per molti giorni</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <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 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 type="obsolete">Il %1 %2 di ogni</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Nessuno</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">°</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">°</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">°</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">°</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/it/libqpe.ts b/i18n/it/libqpe.ts
index 89e0f45..fcfc894 100644
--- a/i18n/it/libqpe.ts
+++ b/i18n/it/libqpe.ts
@@ -186,28 +186,24 @@ modificando le categorie.</translation>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Stringa Non Trovata.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Raggiunta la fine, inizio da capo</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Trova</translation>
     </message>
     <message>
@@ -444,62 +440,48 @@ before entering data</source>
         <translation>Impossibile creare i file di avvio.
 Liberare dello spazio prima di
 inserire i dati</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Impossibile programmare l&apos;allarme.
 Liberare dello spazio di memoria e
 riprovare.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">G</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>giorno</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mese</translation>
     </message>
     <message>
         <source>year</source>
         <translation>anno</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Sei sicuro di voler cancellare
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Tutte</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Vuota</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Indirizzo Lavoro:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -782,44 +764,24 @@ riprovare.</translation>
         <source>Fri</source>
         <translation>Ven</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Premi per chiudere questa finestra, abbandonando le modifiche effettuate.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Premi per chiudere questa finestra.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Premi per chiudere questa finestra e salvare le modifiche effettuate.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Premi per spostare la finestra.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Premi per ingrandire al massimo questa finestra.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;La guida completa non è disponibile per questa applicazione, è comunque presente la guida base.&lt;p&gt;Per usare la guida:&lt;p&gt;&lt;ol&gt;&lt;li&gt;tieni premuto il tasto di aiuto.&lt;li&gt;quando apparirà &lt;b&gt;Cos&apos;è...&lt;/b&gt;, premi un qualunque tasto.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Cos&apos;è...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Vuoi veramente eliminare
  %1?&lt;/qt&gt;</translation>
@@ -864,28 +826,24 @@ riprovare.</translation>
         <source>Oct</source>
         <translation>Ott</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dic</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Errore</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">G</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/it/libtodayaddressbookplugin.ts b/i18n/it/libtodayaddressbookplugin.ts
index 76d5e14..1864e52 100644
--- a/i18n/it/libtodayaddressbookplugin.ts
+++ b/i18n/it/libtodayaddressbookplugin.ts
@@ -2,44 +2,32 @@
 <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 type="obsolete">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 type="obsolete">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>
-    </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>
diff --git a/i18n/it/libtodaydatebookplugin.ts b/i18n/it/libtodaydatebookplugin.ts
index b80c691..549b468 100644
--- a/i18n/it/libtodaydatebookplugin.ts
+++ b/i18n/it/libtodaydatebookplugin.ts
@@ -7,83 +7,24 @@
         <translation>[con allarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Tutto il giorno</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Mostra luogo</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Spunta se deve essere mostrato per ognuno il luogo di un appuntamento</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Mostra note</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Spunta se deve essere mostrata per ognuno la nota associata ad un appuntamento</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Mostra solo ultimi
- appuntamenti</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Spunta se devono essere mostrati solo gli appuntamenti dopo l&apos;orario corrente</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Quanti 
-appuntamenti
-devono essere 
-mostrati?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Quanti appuntamenti devono essere mostrati al massimo. In ordine cronologico</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Quanti altri giorni</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Quanti altri giorni devono essere nel campo</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete"> giorno(i)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">solo oggi</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>Configurazione Plugin Agenda</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Mostra luogo</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Spunta se deve essere mostrato per ognuno il luogo di un appuntamento</translation>
diff --git a/i18n/it/libtodaytodolistplugin.ts b/i18n/it/libtodaytodolistplugin.ts
index cacb1ba..f74d98a 100644
--- a/i18n/it/libtodaytodolistplugin.ts
+++ b/i18n/it/libtodaytodolistplugin.ts
@@ -29,32 +29,13 @@
         <source>tasks shown</source>
         <translation>impegni mostrati</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Dopo quanti caratteri devono essere tagliati i dettagli dell&apos;impegno</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Taglia la riga dopo X caratteri</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">mostra impegni</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Imposta il numero massimo di impegni da mostrare</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Taglia la riga dopo X caratteri</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Dopo quanti caratteri le informazioni sull&apos;impegno devono essere tagliate</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/it/libtodayweatherplugin.ts b/i18n/it/libtodayweatherplugin.ts
index 76e1e73..9d814cd 100644
--- a/i18n/it/libtodayweatherplugin.ts
+++ b/i18n/it/libtodayweatherplugin.ts
@@ -98,25 +98,21 @@ Pres: </translation>
         <source>SE </source>
         <translation>SE </translation>
     </message>
     <message>
         <source> KPH</source>
         <translation> KPH</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation> MPH</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete"> hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation> Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/libwlan.ts b/i18n/it/libwlan.ts
index abd8928..c6239c1 100644
--- a/i18n/it/libwlan.ts
+++ b/i18n/it/libwlan.ts
@@ -1,298 +1,149 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">Configurazione Wireless</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Generale</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation type="obsolete">Modalità</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation type="obsolete">ESS-ID</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">Specifica &amp;Access Point</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Channel</source>
-        <translation type="obsolete">Specifica &amp;Canale</translation>
+        <translation type="unfinished">Generale</translation>
     </message>
     <message>
         <source>any</source>
-        <translation type="obsolete">tutti</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="obsolete">Infrastruttura</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="obsolete">Auto</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation type="obsolete">Gestista</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation type="obsolete">Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation type="obsolete">Crittografia</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">&amp;Abilita Crittografia</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation type="obsolete">&amp;Impostazioni Chiave</translation>
-    </message>
-    <message>
-        <source>Key &amp;1</source>
-        <translation type="obsolete">Chiave &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation type="obsolete">Chiave &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="obsolete">Chiave &amp;3</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation type="obsolete">Chiave &amp;4</translation>
-    </message>
-    <message>
-        <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Pacchetti non criptati</translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Accetta</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
-        <translation type="obsolete">&amp;Rifiuta</translation>
+        <source>SSID</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>General</source>
-        <translation type="unfinished">Generale</translation>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished">Gestista</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished">Ad-Hoc</translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished">Modalità</translation>
     </message>
     <message>
-        <source>ESS-ID</source>
-        <translation type="unfinished">ESS-ID</translation>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished">MAC</translation>
     </message>
     <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Encryption</source>
         <translation type="unfinished">Crittografia</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished">&amp;Abilita Crittografia</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished">&amp;Impostazioni Chiave</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished">Chiave &amp;1</translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished">Chiave &amp;4</translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished">Chiave &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished">Chiave &amp;3</translation>
     </message>
     <message>
-        <source>AP</source>
-        <translation type="unfinished">AP</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation type="unfinished">Frequenza</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished">Canale</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation type="unfinished">Stazione</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished">ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation type="unfinished">Rumore</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished">Qualità</translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation type="unfinished">Segnale</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation type="unfinished"></translation>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Chiave &amp;4</translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
-    <message>
-        <source>WLan Device</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Informazioni Interfaccia</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">Canale</translation>
+        <translation type="unfinished">Canale</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Modalità</translation>
+        <translation type="unfinished">Modalità</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Stazione</translation>
+        <translation type="unfinished">Stazione</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">AP</translation>
+        <translation type="unfinished">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Frequenza</translation>
+        <translation type="unfinished">Frequenza</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Qualità</translation>
+        <translation type="unfinished">Qualità</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Rumore</translation>
+        <translation type="unfinished">Rumore</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Segnale</translation>
+        <translation type="unfinished">Segnale</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/mindbreaker.ts b/i18n/it/mindbreaker.ts
index 2ab4ec1..781fe0e 100644
--- a/i18n/it/mindbreaker.ts
+++ b/i18n/it/mindbreaker.ts
@@ -9,36 +9,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>perc vitt: %1 turni (%2 partite)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Go%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">CorrenteGo%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Risposta%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Azzera Statistiche</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Azzero la percentuale di vittorie?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
diff --git a/i18n/it/minesweep.ts b/i18n/it/minesweep.ts
index 1683f47..07f5c0c 100644
--- a/i18n/it/minesweep.ts
+++ b/i18n/it/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Hai vinto!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Sei esploso!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Campo Minato</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Principiante</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Intermedio</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Esperto</translation>
     </message>
     <message>
diff --git a/i18n/it/opie-console.ts b/i18n/it/opie-console.ts
index cbed62b..b9c5735 100644
--- a/i18n/it/opie-console.ts
+++ b/i18n/it/opie-console.ts
@@ -783,28 +783,24 @@
         <source>SynchronizedFile</source>
         <translation>File Sincronizzato</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Numero in composizione: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Fallita</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Composizione del numero fallita.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Cancellazione...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Ricerca modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Inizializzazione...</translation>
     </message>
     <message>
@@ -849,40 +845,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Tipo Terminale</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Schema colore</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Dimensione Font</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">piccolo</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">medio</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">grande</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Conversioni line-break</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>In arrivo</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>In uscita</translation>
     </message>
     <message>
diff --git a/i18n/it/opie-eye.ts b/i18n/it/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/it/opie-eye.ts
+++ b/i18n/it/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/it/opie-login.ts b/i18n/it/opie-login.ts
index adaad12..7f84b1e 100644
--- a/i18n/it/opie-login.ts
+++ b/i18n/it/opie-login.ts
@@ -1,26 +1,22 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 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 type="obsolete">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>
@@ -42,54 +38,36 @@ con fermezza per tarare lo schermo.</translation>
 </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 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>
diff --git a/i18n/it/opieirc.ts b/i18n/it/opieirc.ts
index 9715ad8..b9e65ad 100644
--- a/i18n/it/opieirc.ts
+++ b/i18n/it/opieirc.ts
@@ -65,28 +65,24 @@
         <source>Talking on channel</source>
         <translation>In conversazione nel canale</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Tema del canale</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Digita qui il tuo messaggio per partecipare alla discussione nel canale</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versione</translation>
     </message>
     <message>
@@ -154,48 +150,40 @@
         <source>Channel for part not found - desynchronized?</source>
         <translation>Canale non trovato - non sincronizzato?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Messaggio al canale con mittente sconosciuto</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Ricevuto PRIVMSG di tipo sconosciuto</translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Nickname di un utente sconosciuto modificato</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Utente sconsciuto uscito - non sincronizzato?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>modifica tema con</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Tema canale sconosciuto - non sincronizzato?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Ricevuto un CTCP PING da </translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">Ricevuto un CTCP VERSION da </translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION con utente sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION con canale sconosciuto - Non sincronizzato?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION con destinatario errato</translation>
     </message>
     <message>
@@ -274,32 +262,24 @@
         <source>You left channel %1</source>
         <translation>Hai lasciato il canale %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 ha lasciato il canale %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Messaggio canale con canale sconosciuto %1</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">Sei conosciuto ora come %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 è ora conosciuto come %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 è uscito (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -489,36 +469,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>E&apos; richiesto un nome profilo</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>E&apos; richiesto un hostname</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">E&apos; richiesta una porta</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>E&apos; richiesto un nickname</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">E&apos; richiesto un nome reale</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>La lista canali contine una lista di canali
 separati da virgola che iniziato con &apos;#&apos;
 o &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -551,28 +523,24 @@ o &apos;+&apos;</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Modifica il profilo server corrente</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Aggiungi un nuovo profilo server</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Connessione a</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Messaggi del server</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Digita qui i comandi. Nella guida di OpieIRC puoi trovare una lista di comandi disponibili</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/it/opiemail.ts b/i18n/it/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/it/opiemail.ts
+++ b/i18n/it/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/it/opierec.ts b/i18n/it/opierec.ts
index fc0961a..3a5dd96 100644
--- a/i18n/it/opierec.ts
+++ b/i18n/it/opierec.ts
@@ -29,72 +29,40 @@
         <source>Time</source>
         <translation>Orario</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>File</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Freq. Campionamento</translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">44100</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">32000</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">22050</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">16000</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">11025</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">8000</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>Dimensione Limite</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Illimitata</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Directory File</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Profondità di Bit</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">16</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">8</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opzioni</translation>
     </message>
     <message>
@@ -105,58 +73,36 @@
         <source>Low Disk Space</source>
         <translation>Spazio Disco Basso</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Si sta esaurendo lo spazio per
 la registrazione oppure una
 scheda non è stata riconosciuta</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete"> secondi</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Vuoi veramente &lt;font size=+2&gt;&lt;B&gt;CANCELLARE&lt;/B&gt;&lt;/font&gt;
-il file selezionato?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sì</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">No</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Impossibile rimuovere il file.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Seleziona il file da riprodurre</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Impossibile aprire il file audio.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Riproduci</translation>
@@ -173,52 +119,32 @@ il file selezionato?</translation>
         <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 type="obsolete">Registra</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Ubicazione</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compressione (file più piccoli)</translation>
     </message>
     <message>
-        <source>auto Mute</source>
-        <translation type="obsolete">Mute automatico</translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>mute</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Stop</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/it/osearch.ts b/i18n/it/osearch.ts
index 5c76cbc..7858501 100644
--- a/i18n/it/osearch.ts
+++ b/i18n/it/osearch.ts
@@ -38,28 +38,24 @@
         <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 type="obsolete">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>
     <message>
@@ -72,36 +68,24 @@
     </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 type="obsolete">mostra attività terminate</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">mostra eventi passati</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">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>
@@ -116,28 +100,24 @@
         <source>Link: </source>
         <translation>Link: </translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Mimetype: </translation>
     </message>
     <message>
         <source>open with </source>
         <translation>apri con</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">cerca contenuto</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>in ricerca %1</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>
diff --git a/i18n/it/oxygen.ts b/i18n/it/oxygen.ts
index 0f09500..e5ca347 100644
--- a/i18n/it/oxygen.ts
+++ b/i18n/it/oxygen.ts
@@ -41,40 +41,28 @@
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elettronegatività</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Raggio atomico</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Energ. ionizzazione</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Densità</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Punto ebollizione</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Punto fusione</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
diff --git a/i18n/it/patience.ts b/i18n/it/patience.ts
index f99552e..d3a97d8 100644
--- a/i18n/it/patience.ts
+++ b/i18n/it/patience.ts
@@ -18,68 +18,44 @@
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Partita</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Cambia Retro delle Carte</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Metti In Posizione</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Settaggi</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Informazioni</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Gioca</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Cambia Retro delle Carte</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Metti In Posizione</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Gira Una Carta</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Settaggi</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Gira Tre Carte</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation>&amp;Cambia retro delle carte</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Metti in posizione</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Cambia retro delle carte</translation>
     </message>
     <message>
diff --git a/i18n/it/qpe.ts b/i18n/it/qpe.ts
index 6838f84..78981f2 100644
--- a/i18n/it/qpe.ts
+++ b/i18n/it/qpe.ts
@@ -58,98 +58,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Problema Applicazione</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 non risponde.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Vuoi forzare l&apos;applicazione ad uscire?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Tocca le crocette accuratamente e
 con decisione per tarare il tuo schermo.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Benvenuto in Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documenti</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Mostra Icone</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Mostra Lista</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Il livello della batteria è critico!
-Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">La batteria si sta scaricando.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">La batteria di Back-up si sta scaricando.
-Cambiarla subito.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">biglietto da visita</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Informazioni</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;La data di sistema non sembra essere corretta.
-(%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Stato Batteria</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -197,32 +130,24 @@ Cambiarla subito.</translation>
         <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>
@@ -239,107 +164,44 @@ Cambiarla subito.</translation>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 file</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Tutti i tipi di file</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Mostra Documento</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Supporto inserito</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">Un &lt;b&gt;supporto riscrivibile&lt;/b&gt; è stato inserito. Deve essere esaminato?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Quale file</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Immagine</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Testo</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Video</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tutti</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Link applicazioni</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Limita ricerca alla dir: (non ancora usata)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Aggiungi</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">La tua scelta verrà inserita sul supporto.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">Non chiedere nuovamente per questo supporto</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Quale file</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Audio</translation>
@@ -373,31 +235,24 @@ Cambiarla subito.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">Stato Batteria</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -425,36 +280,24 @@ Cambiarla subito.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Informazioni</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;La data di sistema non sembra essere corretta.
 (%1)&lt;/p&gt;&lt;p&gt;Vuoi reimpostare l&apos;orologio ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Il livello della batteria è critico!
-Tieni spento il dispositivo finchè la batteria non è di nuovo carica!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">La batteria di Back-up si sta scaricando.
-Cambiarla subito.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">biglietto da visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -515,81 +358,59 @@ immediately.</source>
         <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="obsolete">&lt;p&gt;
-Queste opzioni di chiusura sono state inserite principalmente per sviluppo e test di Opie. Per un uso normale, queste opzioni non sono necessarie.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Cancella</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">Sospendi...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Sync Connessione</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se stai utilizzando una versione di Qtopia Desktop più vecchia della 1.5.1, fai l&apos;upgrade.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished">Nega</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Un sistema non autorizzato sta richiedendo l&apos;accesso a questo dispositivo.&lt;p&gt;Se hai appena iniziato un Sync per la prima volta, questo è normale.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Permetti</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Sincronizzazione</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Contatti&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancella</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/security.ts b/i18n/it/security.ts
index d2ab077..f6a3510 100644
--- a/i18n/it/security.ts
+++ b/i18n/it/security.ts
@@ -66,48 +66,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">Sync</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -182,164 +158,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Imposta password</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Cambia password</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Inserisci password</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Password errata</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">La password inserita è sbagliata.
-Accesso negato</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Tutti</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nessuno</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Inserisci nuova password</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Rinserisci nuova password</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Impostazioni Sicurezza</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Cambia password</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Cancella password</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Richiedi password all&apos;avvio</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Sync</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Accetta sync dalla rete:</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (predefinita)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Tutte</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nessuna</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;La protezione mediante password fornisce un minimo livello di protezione dall&apos;accesso illegale del dispositivo.</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Password</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Login</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">Login Automatico</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Accetta sync dalla rete:</translation>
diff --git a/i18n/it/snake.ts b/i18n/it/snake.ts
index b7f740e..14e4acc 100644
--- a/i18n/it/snake.ts
+++ b/i18n/it/snake.ts
@@ -14,39 +14,31 @@
         <source>SNAKE!</source>
         <translation>SNAKE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Usare le frecce direzionali per guidare il
 serpente a mangiare il topolino. Non bisogna
 scontrarsi con i muri, gli angoli o la propria coda.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Premi un Tasto per Iniziare</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>     Punti :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FINE PARTITA!
  Punti: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Premi un Tasto per Iniziare una Nuova Partita.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Premere un tasto per iniziare</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Premere un tasto per iniziare una nuova partita.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/it/sysinfo.ts b/i18n/it/sysinfo.ts
index 85bc628..eab41f6 100644
--- a/i18n/it/sysinfo.ts
+++ b/i18n/it/sysinfo.ts
@@ -143,40 +143,24 @@
         <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 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>
@@ -188,66 +172,52 @@ Memory is categorized as follows:
         <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>
-    </message>
-    <message>
         <source>Used by</source>
         <translation>Utilizzato da</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">Eseguire veramente %1 per questo modulo?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation> : %1 kB</translation>
     </message>
     <message>
@@ -293,34 +263,24 @@ Tenere premuto sul nome di un processo per vedere ulteriori informazioni, o per
         <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 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>
@@ -370,32 +330,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Modello: </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/it/tableviewer.ts b/i18n/it/tableviewer.ts
index b0614ba..3e0621b 100644
--- a/i18n/it/tableviewer.ts
+++ b/i18n/it/tableviewer.ts
@@ -1,26 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Impossibile creare valore predefinito per il tipo %1, Chiave non aggiunta.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Tipo valido non trovato</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
         <source>key</source>
         <translation>chiave</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/it/textedit.ts b/i18n/it/textedit.ts
index a95a1f5..3e45666 100644
--- a/i18n/it/textedit.ts
+++ b/i18n/it/textedit.ts
@@ -146,30 +146,24 @@
         <source>Unnamed</source>
         <translation>Senza Nome</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Permessi</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Scegli font</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">Vuoi veramente&lt;BR&gt; &lt;B&gt;cancellare&lt;/B&gt; il file corrente
-dal disco?&lt;BR&gt;Questo è &lt;B&gt;irreversibile!!&lt;/B&gt;</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Sì</translation>
     </message>
     <message>
         <source>No</source>
         <translation>No</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Text Edit è copyright&lt;BR&gt;2000 Trolltech AS, e&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;ed è sotto licenza GPL</translation>
     </message>
     <message>
diff --git a/i18n/it/tictac.ts b/i18n/it/tictac.ts
index ab167a4..da23868 100644
--- a/i18n/it/tictac.ts
+++ b/i18n/it/tictac.ts
@@ -1,22 +1,15 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/it/today.ts b/i18n/it/today.ts
index caec888..4f754d1 100644
--- a/i18n/it/today.ts
+++ b/i18n/it/today.ts
@@ -6,28 +6,24 @@
         <source>Today</source>
         <translation type="unfinished">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 type="obsolete">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>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -60,83 +56,35 @@
         <source>Move Up</source>
         <translation>Muovi Sù</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Muovi Giù</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>attivo/ordine</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">avvio automatico al(new line)
-resume?(new line)
-(solo Opie)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">minuti inattivi</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Varie</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Premi qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Quanti minuti il PDA deve rimanere spento prima che entri in funzione l&apos;autostart</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Dimensioni Icona</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Imposta la dimensione dell&apos;icona in pixel</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Aggiorna</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Quanto spesso Oggi deve aggiornarsi</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete"> sec</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">mai</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>Premi per attivare/disattivare un plugin o utilizza le frecce a destra per cambiare l&apos;ordine di visualizzazione</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configurazione</translation>
     </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Banner Piccolo</translation>
-    </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Premi qui se l&apos;applicazione deve partire automaticamente al riavvio.</translation>
     </message>
     <message>
diff --git a/i18n/it/todolist.ts b/i18n/it/todolist.ts
index 07f9d3e..81ebdd1 100644
--- a/i18n/it/todolist.ts
+++ b/i18n/it/todolist.ts
@@ -62,159 +62,83 @@
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Attività</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Attività Opie</translation>
-    </message>
-    <message>
         <source>Enter Task</source>
         <translation>Inserisci Attività</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Modifica Attività</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>silenzioso</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>alto</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Nuova da modello</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nuova Attività</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Premi qui per creare una nuova attività.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Modifica Attività</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Premi qui per modificare l&apos;attività corrente.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Visualizza Attività</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Elimina...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Premi qui per eliminare l&apos;attività corrente.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Elimina tutti...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Eliminazione completata</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Copia</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">Trasmetti</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Premi qui per inviare l&apos;attività in corso ad un altro dispositivo.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Trova</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Mostra attività completate</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostra solo attività scadute</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostra scadenze attività</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostra quick task bar</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Dati</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Categoria</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opzioni</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Modifica veloce</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Questa è una lista di tutte le attività in corso.
 
 Vengono elencate le seguenti informazioni:
 1. Completata - un segno verde indica che l&apos;attività è stata completata.  Premi qui per completare un&apos;attività.
 2. Priorità - una rappresentazione grafica della priorità dell&apos;attività.  Premi qui due volte per modificarla.
 3. Descrizione - descrizione dell&apos;attività.  Premi qui per selezionare l&apos;attività.
 4. Scadenza - mostra la scadenza dell&apos;attività.  Questa colonna può essere visualizzata o nascosta tramite Opzioni-&gt;&apos;Mostra scadenze attività&apos; dal menù in alto.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Tutte le Categorie</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">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.
@@ -241,36 +165,28 @@ Uscire comunque?</translation>
         <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 type="obsolete">Descrizione</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Scadenza</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
diff --git a/i18n/it/usermanager.ts b/i18n/it/usermanager.ts
index 66f7524..1815157 100644
--- a/i18n/it/usermanager.ts
+++ b/i18n/it/usermanager.ts
@@ -5,28 +5,24 @@
     <message>
         <source>Add Group</source>
         <translation>Aggiungi Gruppo</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Modifica Gruppo</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE Gestione Utente</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Gestione Utenti Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Aggiungi Utente</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/it/zsafe.ts b/i18n/it/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/it/zsafe.ts
+++ b/i18n/it/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/ja/datebook.ts b/i18n/ja/datebook.ts
index fdfa81f..cb64e37 100644
--- a/i18n/ja/datebook.ts
+++ b/i18n/ja/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/ja/libliquid.ts b/i18n/ja/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/ja/libliquid.ts
+++ b/i18n/ja/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/ja/libwlan.ts b/i18n/ja/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/ja/libwlan.ts
+++ b/i18n/ja/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/ja/opie-eye.ts b/i18n/ja/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/ja/opie-eye.ts
+++ b/i18n/ja/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ja/opiemail.ts b/i18n/ja/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/ja/opiemail.ts
+++ b/i18n/ja/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/ja/zsafe.ts b/i18n/ja/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/ja/zsafe.ts
+++ b/i18n/ja/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/ko/datebook.ts b/i18n/ko/datebook.ts
index fdfa81f..cb64e37 100644
--- a/i18n/ko/datebook.ts
+++ b/i18n/ko/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/ko/libliquid.ts b/i18n/ko/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/ko/libliquid.ts
+++ b/i18n/ko/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/ko/libwlan.ts b/i18n/ko/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/ko/libwlan.ts
+++ b/i18n/ko/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/ko/opie-eye.ts b/i18n/ko/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/ko/opie-eye.ts
+++ b/i18n/ko/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/ko/opiemail.ts b/i18n/ko/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/ko/opiemail.ts
+++ b/i18n/ko/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/ko/zsafe.ts b/i18n/ko/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/ko/zsafe.ts
+++ b/i18n/ko/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/lv/addressbook.ts b/i18n/lv/addressbook.ts
index e8ab440..ac93f8e 100644
--- a/i18n/lv/addressbook.ts
+++ b/i18n/lv/addressbook.ts
@@ -19,92 +19,24 @@
     <message>
         <source>Unfiled</source>
         <translation>Neierakstīts</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakti</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Vizītkarte</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Skats</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Saraksts</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Karte</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Jauns</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Labot</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Dzēst</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Meklēt</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Sākt Meklēšanu</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Aizvērt Meklēšanu</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Rakstīt E-pastu Uz</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Nosūtīt Ierakstu</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importēt vKarti</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Eksportēt vKarti</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Informācija par Mani</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Saglabāt visus Datus</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Konfigurācija</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Jums jāatzīmē kontaktinformācija !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Jums jāuzstāda faila nosaukums !</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Pareizs faila tips ?</translation>
     </message>
     <message>
@@ -133,28 +65,24 @@ Vai tiešām vēlaties to atvērt?</translation>
         <translation>Vai tiešām vēlaties pievienot kontaktu 
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Visiem Jā</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nevaru labot datus, patreiz sinhronizēju</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Labot Adresi</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>Labot Manu Personīgo Info</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakti - Manas Personīgās Detaļas</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Nepietiek vietas</translation>
     </message>
     <message>
@@ -169,36 +97,28 @@ un mēģiniet vēlreiz.
 
 Vai pārtraukt?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Nav Atrasts</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Nevaru atrast kontakinformāciju šai maskai!</translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation type="obsolete">Kartes</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Visas</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Neierakstīts</translation>
-    </message>
-    <message>
         <source>Edit Contact</source>
         <translation>Labot Kontaktu</translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Konfigurācija</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
diff --git a/i18n/lv/advancedfm.ts b/i18n/lv/advancedfm.ts
index 442bdd6..22ca380 100644
--- a/i18n/lv/advancedfm.ts
+++ b/i18n/lv/advancedfm.ts
@@ -5,38 +5,24 @@
         <source>AdvancedFm :: </source>
         <translation>AdvancētaisFm ::</translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>kB brīvs</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Piezīme</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Šāda direktorija neeksistē</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Uzlabotais FailuMenedžeris
-visas tiesības rezervētas 2002-2003 g.
-L.J.Potters&lt;llornkcor@handhelds.org&gt;
-un ir licezēts ar GPL</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Rādīt Slēptos Failus</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Mainīt Direktoriju</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Palaist</translation>
     </message>
     <message>
@@ -99,30 +85,24 @@ un ir licezēts ar GPL</translation>
         <source>Properties</source>
         <translation>Parametri</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Bīmot Failu</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>UzlabotaisFm</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Nevaru izņemt tekošo direktoriju no grāmatzīmēm.  Tas nav iezīmēts!</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Fails</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Skats</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Failu Meklēšana</translation>
     </message>
     <message>
@@ -157,117 +137,48 @@ It is not bookmarked!</source>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Vai tiešām dzēst
-%1 failus?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Jā</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nē</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Dzēst Direktoriju?</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Vai tiešām dzēst %1 un visu tā saturu ?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Tiešām dzēst
-%1?</translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Tiešām kopēt
-%1 failus?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Fails Eksistē!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 eksistē. Tiešām pārrakstīt?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Nevaru kopēt %1 uz %2</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-eksistē. Tiešām pārrakstīt?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Nevaru nokopēt</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">uz
-</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Kopēt</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Kā</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">jau eksistē
-Vai tiešām vēlaties to dzēst?</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Nevaru pārvietot</translation>
-    </message>
-    <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="obsolete">Nevaru nokopēt
-%1
-uz
-%2</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>UzlabotāFm Izvads</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Uzlabotaisfm Bīmots</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir nosūtīts.</translation>
     </message>
     <message>
diff --git a/i18n/lv/appearance.ts b/i18n/lv/appearance.ts
index 8629e4f..cfc1b2f 100644
--- a/i18n/lv/appearance.ts
+++ b/i18n/lv/appearance.ts
@@ -61,64 +61,24 @@ Klikšķiniet šeit lai izvēlētos pieejamo shēmu.</translation>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klikšķiniet šeit lai dzēstu kreisajā pusē iezīmēto krāsu shēmu.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Saglabāt</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klikšķīniet šeit lai nosauktu un saglabātu tekošo shēmu.</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Piespiedu stils priekš visām aplikācijām.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai atļautu visām aplikācijām lietot globālos izskata uzstādījumus.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Noliegt stilošanu šīm aplikācijām (&lt;b&gt;*&lt;/b&gt; var tikt lietots kā noklusējums):</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Ja kāda aplikācija ar globāliem izskata uzstādījumiem netiek attēlota korekti, dažas iespējas var tikt izslēgtas šīm aplikācijām.
-
-Šis lauks atļauj jums iezīmēt aplikācijas un kurus uzstādījumus vēlaties noliegt.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binārais fails(i)</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai pievienotu aplikāciju sarakstam zemāk.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai dzēstu tekošo iezīmēto aplikāciju.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai pārvietotu tekošo iezīmēto aplikāciju sarakstā uz augšu.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai pārvietotu tekošo iezīmēto aplikāciju sarakstā uz leju.</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Tabu stils:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klikšķiniet šeit lai izvēlētos stilu tabu dialogiem (tādu kā šī aplikācija).  Ir pieejami stili:
 
@@ -203,28 +163,24 @@ This area allows you to select an application and which settings you wish to dis
         <source>Scheme does already exist.</source>
         <translation>Shēma jau eksistē.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Dzēst shēmu</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Nevaru izdzēst tekošo shēmu.</translation>
     </message>
     <message>
-        <source>&lt;new&gt;</source>
-        <translation type="obsolete">&lt;jauns&gt;</translation>
-    </message>
-    <message>
         <source>Show Scrollbars on the left</source>
         <translation>Rādīt Skroljoslas pa kreisi</translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation>Klikšķiniet šeit lai attēlotu srkoljoslas kresajā nevis labajā pusē.</translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
diff --git a/i18n/lv/aqpkg.ts b/i18n/lv/aqpkg.ts
index 8733580..6620f0b 100644
--- a/i18n/lv/aqpkg.ts
+++ b/i18n/lv/aqpkg.ts
@@ -196,56 +196,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Nevaru atvērt statusa failu -</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Nevaru izveidot pagaidu statusa failu -</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Nevaru iestartēt ipkg procesu</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Nevaru atvērt :</translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Veidoju direktoriju</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Saistīts %1 ar %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Neizdevās saite %1 uz %2</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Izņemts %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Neizdevās izņemt %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Izņemts</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Neizdevās izņemt</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation>Nevaru startēt ipkg-link procesu</translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation>Simbolu sasaiste neizdevās!</translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation>Simbolu sasaiste izdevās.</translation>
diff --git a/i18n/lv/backup.ts b/i18n/lv/backup.ts
index a147255..42a63a3 100644
--- a/i18n/lv/backup.ts
+++ b/i18n/lv/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Kopēšana un Atjaunošana... strādāju...</translation>
-    </message>
-    <message>
         <source>Error from System:
 </source>
         <translation>Sistēmas kļūda:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Ziņa</translation>
     </message>
     <message>
         <source>Backup Failed!</source>
         <translation>Kopēšana Neizdevās!</translation>
@@ -86,91 +82,63 @@
 </context>
 <context>
     <name>BackupAndRestoreBase</name>
     <message>
         <source>Backup And Restore</source>
         <translation>Kopēšana un Atjaunošana</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopēšana</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Saglabāt Uz</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopēšana</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikācijas</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Atjaunot</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolonna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Atjaunot</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Izvēlaties Avotu</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Atjaunot Failusarakstu</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation>Atrašanās vietas</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Pievienot</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Izņemt</translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="obsolete">Saglabāt</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation>Adresāts</translation>
     </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Tips</translation>
-    </message>
-    <message>
-        <source>User Data (Configuration + PIM)</source>
-        <translation type="obsolete">Lieotāja Dati (Konfigurācija + PIM)</translation>
-    </message>
-    <message>
-        <source>Full Backup (Root File System)</source>
-        <translation type="obsolete">Pilna Saglabāšana (Root Failu Sistēma)</translation>
-    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Kļūdas Info</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Kļūdas Paziņojums:</translation>
     </message>
     <message>
diff --git a/i18n/lv/bartender.ts b/i18n/lv/bartender.ts
index b21c0d8..50912d9 100644
--- a/i18n/lv/bartender.ts
+++ b/i18n/lv/bartender.ts
@@ -80,36 +80,28 @@
         <source>New Drink</source>
         <translation>Cits Dzēriens</translation>
     </message>
     <message>
         <source>Open Drink</source>
         <translation>Atvērt Dzērienu</translation>
     </message>
     <message>
         <source>Find by Drink Name</source>
         <translation>Meklēt pēc nosaukuma</translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="obsolete">Meklēt pēc Alkohola</translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="obsolete">labot</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Jauns</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Atvērt</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Meklēt</translation>
     </message>
     <message>
@@ -128,28 +120,24 @@
     </message>
     <message>
         <source>Search by drink name
 </source>
         <translation>Meklēt pēc dzēriena nosaukuma
 </translation>
     </message>
     <message>
         <source>Drink Name</source>
         <translation>Dzēriena Nosaukums</translation>
     </message>
     <message>
-        <source>Alcohol</source>
-        <translation type="obsolete">Alkohols</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Sorry no results for
 </source>
         <translation>Atvainojiet nav rezultātu priekš
 </translation>
     </message>
     <message>
         <source>Find by Ingredient</source>
         <translation>Meklēt pēc Sastāvdaļas</translation>
diff --git a/i18n/lv/calculator.ts b/i18n/lv/calculator.ts
index 0da877e..3d7116d 100644
--- a/i18n/lv/calculator.ts
+++ b/i18n/lv/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Eksperimentālais Kalkulators</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
diff --git a/i18n/lv/calibrate.ts b/i18n/lv/calibrate.ts
index 229a466..305f144 100644
--- a/i18n/lv/calibrate.ts
+++ b/i18n/lv/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Pieskarieties viegli krustiņiem un
 akurāti kalibrējiet ekrānu.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Laipni lūgti Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/lv/clock.ts b/i18n/lv/clock.ts
index 91f74c3..483c0e6 100644
--- a/i18n/lv/clock.ts
+++ b/i18n/lv/clock.ts
@@ -31,72 +31,36 @@
     <message>
         <source> mins</source>
         <translation>minūtes</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Aizvērt</translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Iemigt</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Pulkstenis</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Hronometrs</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Starts</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Pārstatīt</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Uzstādīt Modinātāju</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Uzstādīt datumu un laiku.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Modinātājs ieslēgts</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Modinātājs Izslēgts</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Modinātājs uzstādīts: %1</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Pulkstenis: Modinātājs palaists garām.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation>P</translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation>O</translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -231,46 +195,13 @@ izvēlēties vismaz vienu dienu.</translation>
         <source>Countdown Alarm</source>
         <translation>Skaitīšanas Atgādinājums</translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation>Atskaņot</translation>
     </message>
     <message>
         <source>Play File</source>
         <translation>Atskaņot Failu</translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Uzstādīt Modinātāju</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Stunda</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minūte</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 modinātājs</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Iemidzināt Uz
-(minūtēm)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Viss</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/lv/datebook.ts b/i18n/lv/datebook.ts
index 0600d2a..db5a93f 100644
--- a/i18n/lv/datebook.ts
+++ b/i18n/lv/datebook.ts
@@ -334,24 +334,32 @@ Labot</translation>
     <message>
         <source>Office</source>
         <translation>Ofiss</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Mājas</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>Šis ir visas dienas notikums.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
diff --git a/i18n/lv/libliquid.ts b/i18n/lv/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/lv/libliquid.ts
+++ b/i18n/lv/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/lv/libnetworksettings2.ts b/i18n/lv/libnetworksettings2.ts
index efd2625..c9a013b 100644
--- a/i18n/lv/libnetworksettings2.ts
+++ b/i18n/lv/libnetworksettings2.ts
@@ -32,32 +32,24 @@
         <source>Connection Profile</source>
         <translation>Savienojuma Profils</translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle IP packets&lt;/p&gt;</source>
         <translation>&lt;p&gt;Iekārtas kas var apstrādāt IP paketes&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle single bytes&lt;/p&gt;</source>
         <translation>&lt;p&gt;Iekārtas kas var apstrādāt baitus&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Tīkla vietas kas strādā ar IP savienojumiem&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Pilnībā konfigurēts savienojuma profils&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Nodes that provide working IP connection&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Fully configured network profile&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection to GPRS device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -79,33 +71,25 @@
         <source>Unknown</source>
         <translation>Nezināms</translation>
     </message>
     <message>
         <source>Unavailable</source>
         <translation>Nepieejams</translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation>Aizliegts</translation>
     </message>
     <message>
-        <source>Off</source>
-        <translation type="obsolete">Izslēgts</translation>
-    </message>
-    <message>
         <source>Available</source>
         <translation>Pieejams</translation>
     </message>
     <message>
-        <source>IsUp</source>
-        <translation type="obsolete">IrAugšā</translation>
-    </message>
-    <message>
         <source>Inactive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Up</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/lv/libopiecore2.ts b/i18n/lv/libopiecore2.ts
index fd40171..5310c66 100644
--- a/i18n/lv/libopiecore2.ts
+++ b/i18n/lv/libopiecore2.ts
@@ -49,28 +49,24 @@
         <source>Upper+Down</source>
         <translation>Augstāk+Lejā</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Augstāk+Pa labi</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Augstāk+Pa kreisi</translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotēt Displeju</translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation>Darbības Poga</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Labi Poga</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Beigu Poga</translation>
     </message>
     <message>
diff --git a/i18n/lv/libopiesecurity2.ts b/i18n/lv/libopiesecurity2.ts
index 5402f87..0cf8c17 100644
--- a/i18n/lv/libopiesecurity2.ts
+++ b/i18n/lv/libopiesecurity2.ts
@@ -1,44 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="obsolete">Laipni lūgti Opie Multi-autentifikācijas sadaļā</translation>
-    </message>
-    <message>
         <source>Launching authentication plugins...</source>
         <translation>Palaižam autentifikācijas spraudņus...</translation>
     </message>
     <message>
         <source>Proceed...</source>
         <translation>Aiziet...</translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="obsolete">Piezīme: patiesai aizsardzībai poga &apos;iziet&apos; ir jāizņem</translation>
-    </message>
-    <message>
         <source>Congratulations! Your authentication has been successful.</source>
         <translation>Apsveicam! Jūsu autentifikācija izdevās.</translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
-        <translation type="obsolete">Jums neizdevās iziet visus autentifikācijas soļus!</translation>
-    </message>
-    <message>
-        <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
-        <translation type="obsolete">Piezīme: ja noņemtu ķeksi no &apos;atļaut apiešanu&apos; drošības konfigurēšanas logā, jums būtu jāatkārto visi soļi.</translation>
-    </message>
-    <message>
         <source>Welcome to Opie</source>
         <translation>Laipni lūgti Opie</translation>
     </message>
     <message>
         <source>Note: this &apos;exit&apos; button only appears during &lt;b&gt;simulations&lt;/b&gt;, like the one we are in. If you don&apos;t succeed a step, remember you can &lt;b&gt;skip&lt;/b&gt; it.</source>
         <translation>PIezīme: šī &quot;iziet&quot; poga parādās &lt;b&gt;simulāciju&lt;/b&gt; laikā, kā piemēram tagad.  Ja tas neizdodas, atceraties jūs varat &lt;b&gt;izlaist&lt;/b&gt; to.</translation>
     </message>
     <message>
         <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation>Jums &lt;b&gt;neizdevās&lt;/b&gt; iziet pietiekošu autorizāciju soļu!</translation>
     </message>
     <message>
diff --git a/i18n/lv/libopieui2.ts b/i18n/lv/libopieui2.ts
index 8b8a129..5e64f7a 100644
--- a/i18n/lv/libopieui2.ts
+++ b/i18n/lv/libopieui2.ts
@@ -1,48 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FailuDialogs</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Atvērt</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Saglabāt</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="obsolete">Izvēlēties Katalogu</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stils</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Izmērs</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Glāžšķūņu utt</translation>
-    </message>
-</context>
-<context>
     <name>OTimePickerDialogBase</name>
     <message>
         <source>OTimePickerDialogBase</source>
         <translation></translation>
     </message>
     <message>
         <source>Time:</source>
         <translation>Laiks:</translation>
     </message>
     <message>
         <source>:</source>
         <translation>:</translation>
diff --git a/i18n/lv/libppp.ts b/i18n/lv/libppp.ts
index 96567a6..91cb2a6 100644
--- a/i18n/lv/libppp.ts
+++ b/i18n/lv/libppp.ts
@@ -183,40 +183,24 @@
     <message>
         <source>Commands</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dialing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPIPEdit</name>
     <message>
-        <source>IPAddress needed</source>
-        <translation type="obsolete">Nepieciešama IPAdrese</translation>
-    </message>
-    <message>
-        <source>IPAddress not valid</source>
-        <translation type="obsolete">IPAdrese nav pareiza</translation>
-    </message>
-    <message>
-        <source>Subnet mask needed</source>
-        <translation type="obsolete">Nepieciešama Subnet maska</translation>
-    </message>
-    <message>
-        <source>Subnet mask not valid</source>
-        <translation type="obsolete">Nav pareiza Subnet maska</translation>
-    </message>
-    <message>
         <source>Gateway address needed</source>
         <translation>Nepieciešama Vārtejas adrese</translation>
     </message>
     <message>
         <source>Gateway address not valid</source>
         <translation>Nav pareiza vārtejas adrese</translation>
     </message>
 </context>
 <context>
     <name>PPPIPGUI</name>
     <message>
         <source>PPPIP</source>
@@ -226,28 +210,24 @@
         <source>IP</source>
         <translation></translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation>Norādīts serveris</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Fiksēts</translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="obsolete">Tīkla maska</translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation>Adrese</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Vārteja</translation>
     </message>
     <message>
         <source>Set as default</source>
         <translation>Uzstādīt kā noklusēto</translation>
     </message>
     <message>
@@ -261,28 +241,24 @@
     <message>
         <source>Remote</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Only if not yet set</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPNetNode</name>
     <message>
-        <source>PPP Connection</source>
-        <translation type="obsolete">PPP Konekcija</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
         <translation>&lt;p&gt;Uzstāda IP lietojot PPP.&lt;/p&gt;&lt;p&gt;Lietojiet šo iezvanpieejas vai seriāliem uzstādījumiem&lt;/p&gt;</translation>
     </message>
     <message>
         <source>PPP connection</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PPPRunGUI</name>
     <message>
         <source>PPPRun</source>
diff --git a/i18n/lv/libprofile.ts b/i18n/lv/libprofile.ts
index fe2c3bb..85e332c 100644
--- a/i18n/lv/libprofile.ts
+++ b/i18n/lv/libprofile.ts
@@ -13,28 +13,24 @@
         <source>Start</source>
         <translation>Sākt</translation>
     </message>
     <message>
         <source>Automatically</source>
         <translation>Aautomātiski</translation>
     </message>
     <message>
         <source>Ask</source>
         <translation>Jautāt</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Aizliegts</translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation>VPN trigeris</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Apraksts</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Statuss</translation>
     </message>
     <message>
@@ -101,32 +97,24 @@
         <source>Errors</source>
         <translation>Kļūdas</translation>
     </message>
     <message>
         <source>Dropped</source>
         <translation>Izmests</translation>
     </message>
     <message>
         <source>Bytes</source>
         <translation>Baiti</translation>
     </message>
     <message>
-        <source>Transmitting</source>
-        <translation type="obsolete">Pāraide</translation>
-    </message>
-    <message>
-        <source>Others</source>
-        <translation type="obsolete">Citi</translation>
-    </message>
-    <message>
         <source>Collisions</source>
         <translation>Kolīzijas</translation>
     </message>
     <message>
         <source>Live feed </source>
         <translation>Dzīvā barotne</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/lv/libtodayaddressbookplugin.ts b/i18n/lv/libtodayaddressbookplugin.ts
index 0a2e74f..a82aa36 100644
--- a/i18n/lv/libtodayaddressbookplugin.ts
+++ b/i18n/lv/libtodayaddressbookplugin.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Lai aktivizētu uzstādījumus: Pārstartējiet aplikāciju !</translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation>Atļaut/Aizliegt Skatus</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Rādīt &amp;Dzimšanas dienas</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>Rādīt &amp;Vārdadienas</translation>
     </message>
     <message>
@@ -25,32 +21,24 @@
         <source>The next anniversaries will just be shown, if enabled !</source>
         <translation>Ja ieslēgsiet tiks rādītas nākamās vārdadienas!</translation>
     </message>
     <message>
         <source>Max Lines: </source>
         <translation>Maks. Rindas:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Uzstādiet maksimālo rindu skaitu ko rādīt katrai svinamdienai</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="obsolete">Klip līnija pēc X simbola:</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Pēc cik simboliem uzdevuma info ir jāapgriež</translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation>Dienas uz priekšu:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Cik dienas uz priekšu ir jāpārskata</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Uzstādīt Virsraksta Krāsu:</translation>
     </message>
     <message>
diff --git a/i18n/lv/libwlan.ts b/i18n/lv/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/lv/libwlan.ts
+++ b/i18n/lv/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/lv/opie-eye.ts b/i18n/lv/opie-eye.ts
index eda2055..a6d1102 100644
--- a/i18n/lv/opie-eye.ts
+++ b/i18n/lv/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation>Ikonu izmērs:</translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation>Rādīt pogu rindu startējot</translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation>Saglabāt pilnekrāna/autorotēšanas statusu</translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation>Skatīt Attēlu Info</translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation>Pārslēgt autorotēšanu</translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation>Pārslēgties uz iepriekšējo attēlu</translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation>Slēgt pilnekrānu</translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation>Slēgt ikonskatu</translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation>Skatīt kā</translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation>Nosūtīt Tekošo</translation>
     </message>
     <message>
@@ -75,47 +87,39 @@
         <source>View Current Item</source>
         <translation>Skatīt Tekošo</translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation>Rādīt Atēla Info</translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation>Dzēst Attēlu</translation>
     </message>
     <message>
-        <source>the Image %1</source>
-        <translation type="obsolete">Attēls %1</translation>
-    </message>
-    <message>
         <source>Image</source>
         <translation>Attēls</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Sākt slaidšovu</translation>
     </message>
     <message>
         <source>the Image</source>
         <translation>Attēls</translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
-        <translation type="obsolete">Phunk Skats - Konfigurēšana</translation>
-    </message>
-    <message>
         <source>Browser Keyboard Actions</source>
         <translation>Pārlūka Klaviatūras Darbības</translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation>Klaviatūras Konfigurācija</translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation>Opie Acs - Konfigurācija</translation>
     </message>
     <message>
@@ -205,45 +209,49 @@
     <message>
         <source>Select filesystem</source>
         <translation>Izvēlēties failu sistēmu</translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation>Lista skata režīms</translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation>Nerādīt atsevišķos logos</translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation>%1 - O Skats</translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
-        <translation type="obsolete">Opie Acs Caramba</translation>
-    </message>
-    <message>
         <source>Show all files</source>
         <translation>Rādīt visus failus</translation>
     </message>
     <message>
-        <source>DirView</source>
-        <translation type="obsolete">KataloguSkats</translation>
-    </message>
-    <message>
         <source>Opie Eye</source>
         <translation>Opie Acs</translation>
     </message>
     <message>
         <source>DocView</source>
         <translation>DokSkats</translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation>Direktoriju Skats</translation>
     </message>
     <message>
@@ -269,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation>Kļūda neatradu kameru</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Vai esiet pārliecināti ka vēlaties dzēst %1&lt;br&gt; %2?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation>Apstiprināt Dzēšanu</translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Ikonu un attēlinfo</translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation>Ikonu un nosaukumu skats</translation>
     </message>
     <message>
diff --git a/i18n/lv/opie-eye_slave.ts b/i18n/lv/opie-eye_slave.ts
index 5ab284d..edec240 100644
--- a/i18n/lv/opie-eye_slave.ts
+++ b/i18n/lv/opie-eye_slave.ts
@@ -144,159 +144,24 @@
     </message>
     <message>
         <source>Compression: %1
 </source>
         <translation>Kompresija: %1</translation>
     </message>
     <message>
         <source>InterlaceMode: %1
 </source>
         <translation>PārklāšanāsRežīms: %1</translation>
     </message>
     <message>
-        <source>Colormode: Color
-</source>
-        <translation type="obsolete">Krāsurežīms: Krāsa</translation>
-    </message>
-    <message>
-        <source>Colormode: Black and white
-</source>
-        <translation type="obsolete">Krāsurežīms: Melnbalts
-</translation>
-    </message>
-    <message>
-        <source>Basic</source>
-        <translation type="obsolete">Pamata</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normāls</translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="obsolete">Precīzi</translation>
-    </message>
-    <message>
-        <source>Quality: %1
-</source>
-        <translation type="obsolete">Kvalitāte: %1
-</translation>
-    </message>
-    <message>
-        <source>Daylight</source>
-        <translation type="obsolete">Dienasgaisma</translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="obsolete">Fluroscents</translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="obsolete">Tungsten</translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="obsolete">Standarta gaišs A</translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="obsolete">Standarta gaišs B</translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="obsolete">Standarta gaišs C</translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="obsolete">D55</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="obsolete">Cits</translation>
-    </message>
-    <message>
-        <source>White Balance: %1
-</source>
-        <translation type="obsolete">Baltā Balanss: %1
-</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">Vidēji</translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="obsolete">Centrāli izvērti vidējais</translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="obsolete">Punkts</translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="obsolete">Daudzpunktu</translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="obsolete">Raksts</translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="obsolete">Daļējs</translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
-</source>
-        <translation type="obsolete">Matering Režīms: %1
-</translation>
-    </message>
-    <message>
-        <source>Not defined</source>
-        <translation type="obsolete">Nav definēts</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Rokas</translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="obsolete">Normāla programma</translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="obsolete">Atklāšanas prioritāte</translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="obsolete">Aizklāšanas prioritāte</translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="obsolete">Portreta režīms
-(bildēm ar fonu bez fokusa)</translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="obsolete">Ainavas režīms
-(ainavu atēliem)</translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
-</source>
-        <translation type="obsolete">Attīstīšanas Programma: %1
-</translation>
-    </message>
-    <message>
         <source>Date/Time: %1
 </source>
         <translation>Datums/Laiks: %1
 </translation>
     </message>
     <message>
         <source>&lt;qt&gt;Comment: %1
 </source>
         <translation>&lt;qt&gt;Komentārs: %1
 </translation>
     </message>
     <message>
diff --git a/i18n/lv/opie-sheet.ts b/i18n/lv/opie-sheet.ts
index 2aad64e..9b54f9d 100644
--- a/i18n/lv/opie-sheet.ts
+++ b/i18n/lv/opie-sheet.ts
@@ -132,25 +132,25 @@
         <source>Find &amp; Replace</source>
         <translation>Meklēt &amp; Aizvietot</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Opie Sheet</source>
         <translation>Opie Tabula</translation>
     </message>
     <message>
         <source>Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kļūda</translation>
     </message>
     <message>
         <source>Inconsistency error!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File cannot be saved!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File cannot be opened!</source>
         <translation type="unfinished"></translation>
@@ -380,33 +380,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>R&amp;emove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sort Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Sort</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Šķirot</translation>
     </message>
     <message>
         <source>Find &amp;&amp; Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Find &amp;&amp; Replace</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Meklēt &amp;&amp; Aizvietot</translation>
     </message>
     <message>
         <source>Equal To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Equal To</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Addition</source>
         <translation type="unfinished"></translation>
@@ -926,25 +926,25 @@ http://qtopia.sitebest.com</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There is only one sheet!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Tips</translation>
     </message>
     <message>
         <source>Shift cells &amp;down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Shift cells &amp;right</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entire ro&amp;w</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/lv/opiemail.ts b/i18n/lv/opiemail.ts
index 60c00ca..c334101 100644
--- a/i18n/lv/opiemail.ts
+++ b/i18n/lv/opiemail.ts
@@ -70,28 +70,24 @@
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Lūdzu izvēlaties failu.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation>Nosūta pastu</translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="obsolete">Nav norādīts saņēmējs</translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation>Saglabāt ziņu</translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation>Saglabāt ziņu melnrakstos?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Jā</translation>
     </message>
     <message>
@@ -242,28 +238,24 @@
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Konfigurēt IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Lietot SSL</translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Ports</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Serveris</translation>
     </message>
     <message>
@@ -332,24 +324,76 @@
     <message>
         <source>Sender</source>
         <translation>Sūtītājs</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datums</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">Serveris</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished">Veidot jaunu folderi</translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation>Abonētās intreškopas</translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -359,32 +403,24 @@
         <source>Newsgroups</source>
         <translation>Intreškopas</translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation>Saraksts ar kopām no servera. Sākumā tiek parādītas tikai abonētās.</translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation>Kopufiltrs:</translation>
     </message>
     <message>
-        <source>Enter a filter string here.
-Then hit &quot;get newsgroup list&quot; again and only groups starting 
-with that filter will be listet.</source>
-        <translation type="obsolete">Šeit ievadiet atlases kritēriju.
-Tad vēlreiz nospiediet &quot;saņemt intreškopu sarakstu&quot; un tiks parādītas
-tika kopas ar šo filtru.</translation>
-    </message>
-    <message>
         <source>Get newsgroup list from server</source>
         <translation>Saņemt intreškopu sarakstu no servera</translation>
     </message>
     <message>
         <source>Retrieve the list of groups from server</source>
         <translation>Saņemt no servera  intreškopu sarakstu</translation>
     </message>
     <message>
         <source>Enter a filter string here.
 Then hit &quot;get newsgroup list&quot; again and only groups starting 
 with that filter will be listed.</source>
         <translation>Ievadiet šeit atlases rindu.
@@ -562,28 +598,24 @@ tikai grupas kas sākās ar šo rindu.</translation>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Konfigurēt SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Lietot SSL</translation>
-    </message>
-    <message>
         <source>Use Login</source>
         <translation>Lietot Pieslēgšanos</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Pieslēguma vārds</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>SMTP server nosaukums</translation>
     </message>
     <message>
@@ -675,34 +707,31 @@ tikai grupas kas sākās ar šo rindu.</translation>
     <message>
         <source>Check how often</source>
         <translation>Uzstādīt cik bieži</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Mirgot kad pienāk jauns pasts</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Atskaņot Melodiju kad pienāk jauns pasts</translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation>Forma1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
-        <translation>TekstaLabelis1</translation>
+        <source>Click activate server/folder</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Rādīt Tekstu</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Saglabāt Pievienojumu</translation>
     </message>
@@ -745,32 +774,36 @@ tikai grupas kas sākās ar šo rindu.</translation>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Vai tiešām vēlaties dzēst šo pastu? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation>Rādīt attēla pirmsskatu</translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation>E-Pasts no %1</translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
-        <source>E-Mail by %1</source>
-        <translation type="obsolete">E-Pasts no %1</translation>
-    </message>
-    <message>
         <source>Mail</source>
         <translation>Pasts</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Atbildēt</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Pārsūtīt</translation>
     </message>
     <message>
@@ -792,24 +825,28 @@ tikai grupas kas sākās ar šo rindu.</translation>
     <message>
         <source>Filename</source>
         <translation>Faila nosaukums</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Izmērs</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation>E-Pasta skats</translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation>Izvēlaties SMTP Kontu</translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/lv/opierec.ts b/i18n/lv/opierec.ts
index 893f2b3..8142d67 100644
--- a/i18n/lv/opierec.ts
+++ b/i18n/lv/opierec.ts
@@ -88,54 +88,36 @@
         <source>Low Disk Space</source>
         <translation>Nepietiek Diska Vietas</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Jums paliek maz
 ieraksta vietas
 vai arī karte nav atpazīta</translation>
     </message>
     <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Vai tiešām vēlaties &lt;font size=+2&gt;&lt;B&gt;DZĒST&lt;/B&gt;&lt;/font&gt;
-izvēlēto failu?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Jā</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Nē</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Kļūda</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Nevaru izdzēst failu.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opieieraksts</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Lūdzu izvēlaties failu  spēlēšanai</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Piezīmes</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Nevaru atvērt audio failu.
 </translation>
     </message>
     <message>
         <source>Send with Ir</source>
         <translation>Nosūtīta pa Ir</translation>
diff --git a/i18n/lv/osearch.ts b/i18n/lv/osearch.ts
index c090426..949a4b4 100644
--- a/i18n/lv/osearch.ts
+++ b/i18n/lv/osearch.ts
@@ -37,28 +37,24 @@
         <source>Settings</source>
         <translation>Uzstādījumi</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Meklēt visu</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">Reģistrjūtīgs</translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation>Lietot noklusējumus</translation>
     </message>
     <message>
         <source>Search for: </source>
         <translation>Meklēt:</translation>
     </message>
     <message>
         <source>Enter your search terms here</source>
         <translation>Ievadiet meklējamos vārdus</translation>
     </message>
     <message>
@@ -71,36 +67,24 @@
     </message>
 </context>
 <context>
     <name>OListView</name>
     <message>
         <source>Results</source>
         <translation>Rezultāti</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>show completed tasks</source>
-        <translation type="obsolete">rādīt pabeigtos uzdevumus</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">rādīt pagājušos notikumus</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">meklēt datumos</translation>
-    </message>
-    <message>
         <source>show</source>
         <translation>rādīt</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>labot</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>palaist</translation>
     </message>
     <message>
@@ -115,28 +99,24 @@
         <source>Link: </source>
         <translation>Saite:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Mimetips:</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>atvērt ar</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">meklēšanas konteksts</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>meklēju %1</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Rādīt pabegitos uzdevumus</translation>
     </message>
     <message>
         <source>Show past events</source>
         <translation>Rādīt pagājušos notikumus</translation>
     </message>
     <message>
diff --git a/i18n/lv/qpe.ts b/i18n/lv/qpe.ts
index ecb3f15..ab16c9a 100644
--- a/i18n/lv/qpe.ts
+++ b/i18n/lv/qpe.ts
@@ -64,28 +64,24 @@
         <source>OK</source>
         <translation>Labi</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Atzīmējiet krustiņu un
 akurāti kalibrējiet ekrānu.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Laipni lūgti Opie</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Bateriju Statuss</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Tukšas Baterijas</translation>
     </message>
 </context>
diff --git a/i18n/lv/security.ts b/i18n/lv/security.ts
index 5a97dc7..6424c51 100644
--- a/i18n/lv/security.ts
+++ b/i18n/lv/security.ts
@@ -66,36 +66,28 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
         <source>Login</source>
         <translation>Pieslēgums</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Sinh</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Uzmanību</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Visi lieotāju-definēti diapazoni pazudīs.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Atlikt</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="obsolete">Labi</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation>Visi</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Neviens</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -129,44 +121,32 @@ Jūs varat izvēlēties konfigurētu lietotāju.</translation>
         <source>on Opie resume</source>
         <translation>pie Opie atjaunošanas</translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation>Vairāku spraudņu autentifikācija</translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation>Nepieciešamās izdošanās</translation>
     </message>
     <message>
-        <source>Debug options</source>
-        <translation type="obsolete">Atblusošanas opcijas</translation>
-    </message>
-    <message>
         <source>Don&apos;t protect this config screen</source>
         <translation>Neaizsargāt šo konfigurācijas ekrānu</translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation>Rādīt skaidrojošās formas</translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
-        <translation type="obsolete">Atļaut izlaist autentifikāciju</translation>
-    </message>
-    <message>
-        <source>Note: the third option implies the second one</source>
-        <translation type="obsolete">Piezīme: trešā opcija ietekmē otro</translation>
-    </message>
-    <message>
         <source>Options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Testing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/lv/sysinfo.ts b/i18n/lv/sysinfo.ts
index 72e3404..b7324c0 100644
--- a/i18n/lv/sysinfo.ts
+++ b/i18n/lv/sysinfo.ts
@@ -49,28 +49,24 @@
         <source>&amp;Start Tests!</source>
         <translation>&amp;Sākt Testus!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klikšķiniet šeit, lai palaistu izvēlētos testus.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Izvēlaties modeli ar kuru salīdzināt rezultātus.</translation>
     </message>
     <message>
-        <source>Compare To:</source>
-        <translation type="obsolete">Salīdzināt Ar:</translation>
-    </message>
-    <message>
         <source>error</source>
         <translation>kļūda</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
diff --git a/i18n/lv/tableviewer.ts b/i18n/lv/tableviewer.ts
index 1b5d055..4df882f 100644
--- a/i18n/lv/tableviewer.ts
+++ b/i18n/lv/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Nevaru izveidot noklusēto vērtību tipam %1, Atslēga nav pievienota.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem:setField(%1, %2) Nav atrasts derīgs tips</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Nomest</translation>
     </message>
     <message>
         <source>key</source>
         <translation>atslēga</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/lv/today.ts b/i18n/lv/today.ts
index 73258d8..4fb389e 100644
--- a/i18n/lv/today.ts
+++ b/i18n/lv/today.ts
@@ -5,28 +5,24 @@
         <source>Owned by </source>
         <translation>Īpašnieks </translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Lūdzu aizpildiet savu vizītkarti</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Klišķiniet šeit lai palaistu saistīto aplikāciju</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">Nav atrasti spraudņi</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>Nav aktviēti spraudņi</translation>
     </message>
     <message>
         <source>Today</source>
         <translation>Šodien</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation>Šodien Kļūda</translation>
     </message>
     <message>
diff --git a/i18n/lv/todolist.ts b/i18n/lv/todolist.ts
index 21e27b8..0707812 100644
--- a/i18n/lv/todolist.ts
+++ b/i18n/lv/todolist.ts
@@ -61,159 +61,83 @@
     <message>
         <source>Todo List</source>
         <translation type="unfinished">Darbu Saraksts</translation>
     </message>
     <message>
         <source>Task</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Uzdevumi</translation>
-    </message>
-    <message>
         <source>Enter Task</source>
         <translation>Ievadiet Darbu</translation>
     </message>
     <message>
         <source>Edit Task</source>
         <translation>Labot Darbu</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>klusi</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>skaļi</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Jauns no sagataves</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Jauns Uzdevums</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai izveidotu jaunu uzdevumu.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Labot Uzdevumu</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai labotu tekošo uzdevumu.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Skatīt Uzdevumu</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Dzēst...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai dzēstu tekošo uzdevumu.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Dzēst visu...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Dzēšana pabeigta</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Pavairot</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">Bīmot</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Klikšķiniet šeit lai nosūtītu uzdevumu uz citu iekārtu.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Meklēt</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Rādīt pabeigtus uzdevumus</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Rādīt tikai kavētos darbus</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Rādīt uzdevumu termiņus</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Rādīt ātro uzdevumu joslu</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Dati</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorija</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opcijas</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>ĀtrāLabošana</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Šeit ir visu tekošo uzdevumu saraksts.
 
 Saraksts attēlo sekojošu informāciju:
 1. Pabeigts - Zaļš ķeksis norāda kad uzdevums ir pabeigts. Klikšķiniet lai uzdevumu pabeigtu.
 2. Prioritāte - prioritātes grafiskais atainojums.  Dubultklikšķis šeit, lai labotu.
 3. Apraksts - uzdevuma apraksts.  Klikškiniet šeit lai izvēlētos uzdevumu.
 4. Termiņš - tiek rādīts tikai tad ja darbam ir līdz termiņš.  Šo kolonnu var rādīt/paslēpt izvēloties Opcijas-&gt;&apos;Rādīt uzdevumu termiņus&apos; no izvēlnes zemāk.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Visas Kategorijas</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Neaizpildīts</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Nepietiek vietas</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Uzdevumi nevarēja
 saglabāt izmaiņas
@@ -258,28 +182,24 @@ Vai Begit?</translation>
         <source>Priority</source>
         <translation>Prioritāte</translation>
     </message>
     <message>
         <source>Summary</source>
         <translation>Apkopojums</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation>Termiņš</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">Konfigurēt Sagataves</translation>
-    </message>
-    <message>
         <source>Template Editor</source>
         <translation>Sagatavju Redaktors</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Pievienot</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation>Labot</translation>
     </message>
     <message>
diff --git a/i18n/lv/zsafe.ts b/i18n/lv/zsafe.ts
index 519ba04..cf37a21 100644
--- a/i18n/lv/zsafe.ts
+++ b/i18n/lv/zsafe.ts
@@ -207,54 +207,24 @@ rāda sarakstu ar direktorijiem un failiem</translation>
     <message>
         <source>Please Wait...</source>
         <translation>Lūdzu Uzgaidiet...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSeifs</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nevaru izveidot direktoriju
-../Documents/Application
-
-ZSeifs beidz darbu.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nevaru izveidot direktoriju
-%1
-
-ZSeifs beidz darbu.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nevaru izveidot direktoriju
-../Documents/Application/zsafe
-
-ZSeifs beidz darbu.</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Jauns dokuments</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Atvērt dokumentu</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Saglabāt dokumentu kā ..</translation>
     </message>
     <message>
@@ -377,40 +347,32 @@ ZSeifs beidz darbu.</translation>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Vai vēlaties dzēst?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>N&amp;edzēst</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Labot Ierakstu</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Lietotājs</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Parole</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Jauns Ieraksts</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Ieraksta nosaukmam jābūt atšķirīgam
 no kategorias nosaukuma.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Meklēt</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Ieraksts nav atrasts</translation>
@@ -555,64 +517,36 @@ paroli</translation>
         <source>Category</source>
         <translation>Kategorija</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Gaidīšanas Dialogs</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Savācu Ikonas...</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Veidoju jaunu ZSefa dokumentu</translation>
-    </message>
-    <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Tagad jūs variet ievadīt
 jūsu jaunizveidotā dokumenta 
 paroli divas reizes.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Atvērt ZSefa dokumentu</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Saglabāt ZSeifa dokumentu kā..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Paroļu Menedžeris&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">Zseifs versija 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">autors Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Tulkojis: Gints Polis&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe versija 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/addressbook.ts b/i18n/mk/addressbook.ts
index 66da691..a229b0d 100644
--- a/i18n/mk/addressbook.ts
+++ b/i18n/mk/addressbook.ts
@@ -19,92 +19,24 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Не е внесено</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Контакти</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Контакт</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Преглед</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Листа</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Катичка</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Ново</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Уреди</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Избриши</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Пронајди</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Започни Пребарување</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Затвори Пребарување</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Напиши е-порака до</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Пренеси запис</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Вметни вКаричка</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Извези вКаричка</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Мои лични детали</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Сними ги сите податоци</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Конфигурација</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Треба да изберете контакт!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Треба да поставите име на даотека !</translation>
     </message>
     <message>
         <source>Right file type ?</source>
         <translation>Точен тип на датотека ?</translation>
     </message>
     <message>
@@ -133,28 +65,24 @@
         <translation>Дали сакате да додадете контакт за
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Да за сите</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Неможе да се уредуваат податоците, во моментот се синхронизираат</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Уреди Адреса</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>Ѕреди ги моите лични детали</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Контакти -  мои лични детали</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
@@ -170,36 +98,28 @@ Quit anyway?</source>
 Излегување?</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Не е пронајдено</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Не можеше да се пронајде контакт за 
 ова пребарување!</translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation type="obsolete">Катички</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Не е внесено</translation>
-    </message>
-    <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ConfigDlg_Base</name>
     <message>
         <source>Configuration</source>
         <translation>Конфигурација</translation>
     </message>
     <message>
         <source>Click on tab to select one</source>
@@ -1385,180 +1305,13 @@ SHARP основниот ROM.
         <source>Export vCard</source>
         <translation type="unfinished">Извези вКаричка</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Мои лични детали</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Име/Наслов</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Име</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">средно име</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Презиме</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Суфикс</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Сними како</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Работно Место</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Одделение/Сектор</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Компанија</translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Тел. на работа</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Факс на работа</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Службен мобилен</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Адреса за електронска пошта (основна)</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Останати адреси за електронска пошта</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Домашен телефон</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Домашен факс</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Приватен Мобилен</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Улица на фирмата</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Град на фирмата</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Република на Фирмата</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Поштенски код на Фирмата</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Држава на фирмата</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Службен Пејџер</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Интернет страница на фирмата</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Канцеларија</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Професија</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Асистент</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Раководител/менаџер</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Улица</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Град</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Република</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Поштенски код</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Држава</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Интернет страница</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Сопруг/Сопруга</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">пол</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Роденден</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Годишнина</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Надимак</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Деца</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Забелешки</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/advancedfm.ts b/i18n/mk/advancedfm.ts
index f15c742..3598d96 100644
--- a/i18n/mk/advancedfm.ts
+++ b/i18n/mk/advancedfm.ts
@@ -1,34 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Директориумот не постои</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Менаџер на Датотеки 
-copyright 2002-2003 од 
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
- и лиценциран под GPL лиценца</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Прикажи сокриени датотеки</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Промени директориум</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Изврши</translation>
     </message>
     <message>
@@ -91,168 +77,92 @@ L.J.Potter&lt;llornkcor@handhelds.org&gt;
         <source>Properties</source>
         <translation>Својства</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Пренеси датотека</translation>
     </message>
     <message>
         <source>AdvancedFm</source>
         <translation>Напреден Фајл Менаџер</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Неможе да се пренесе 
-тековниот директориум од листата на линкови
-Директорумот не е во листата на линкови!</translation>
-    </message>
-    <message>
         <source>File</source>
         <translation>Датотека</translation>
     </message>
     <message>
         <source>View</source>
         <translation>Преглед</translation>
     </message>
     <message>
         <source>File Search</source>
         <translation>Преберување на датотеки</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Извеши команда со излезни податоци</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Избери се</translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="obsolete">Префрлисе на локална листа</translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="obsolete">Префрли се на Далечинска листа
-</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Стави директориум во листа на линкови</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Отстрани го тековниот директориум од листа на линкови</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Големина</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Датум</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Да избришам
-%1 датотеки?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Избриши директориум?</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Избриши %1
-и неговата содржина?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Избриши 
-%1?</translation>
-    </message>
-    <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Копирај 
-%1 датотеки?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Датотеката постои!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 посоти. Да ја препишам?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Неможе да се копира %1 во %2</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-посоти. Да ја препишам?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Неможе да се копиа
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">во</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation type="unfinished">Копирај</translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished">Како</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">веќе постои.Да ја избришам?</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Не може да се премести</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>
diff --git a/i18n/mk/appearance.ts b/i18n/mk/appearance.ts
index 14d6e4c..535e21b 100644
--- a/i18n/mk/appearance.ts
+++ b/i18n/mk/appearance.ts
@@ -61,65 +61,24 @@ Click here to select an available scheme.</source>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Кликни овде за да се избрише шемата на бои избрана во листата лево.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Сними</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Кликни овдека за да се сними и именува моменталната шема на бои.</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Форсирај стилизирање на сите апликации.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Кликни овде за да се дозволи сите апликации да ги користат глобалните подесувања на изгледот.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Исклучи стилизирање на овие апликации (&lt;b&gt;*&lt;/b&gt; може да се користат како специјални знаци):</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Доколку некои апликации не се прикажуваат правилно со глобалните подесувања на изглед, одредни 
-опции може да бидат исклучени за таа апликација
-
-Овој дел дозволува да се избере аплкација чии подесувања треба да се исклучат.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Бинарна датотека/и</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Кликни овде за да се додаде апликација на листата погоре.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Кликни овде за да избрише избраната апликација.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Кликни овде за да се премести избраната апликација погоре во листата.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Кликни овде за да се премести избраната апликација подоле во листата.</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Стил на јазичиња:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Kликни овде за избор на стил на јазичињаата (како кај оваа апликација). Стиловите на јазичињатра се:
 
@@ -184,64 +143,44 @@ This area allows you to select an application and which settings you wish to dis
         <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 type="obsolete">Рестарт</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Дали сакате да рестартиреате %1 сега?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Да</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&lt;ново&gt;</translation>
-    </message>
-    <message>
         <source>Show Scrollbars on the left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
diff --git a/i18n/mk/aqpkg.ts b/i18n/mk/aqpkg.ts
index 8052beb..10fded0 100644
--- a/i18n/mk/aqpkg.ts
+++ b/i18n/mk/aqpkg.ts
@@ -471,42 +471,34 @@ Oie/Qtopia е вклучена
         <translation>Дали сакаш да се отстрани или преинсталира 
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Отстрани или повторно инсталирај</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Повторно Инсталирај</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">Р</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Дали сакаш да се отстрани или надгради
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Одстрани или Надгради</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">У</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Надградба на стартувач...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Цел&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/mk/backup.ts b/i18n/mk/backup.ts
index 2679199..f53ed8e 100644
--- a/i18n/mk/backup.ts
+++ b/i18n/mk/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Бекап и Обновување...работи...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Бекап и Обновување</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,28 +85,24 @@
         <source>Backup And Restore</source>
         <translation>Бекап и Обновување</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Бекап</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Апликации</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Сними во</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Бекап</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Обновување</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Избери извор</translation>
     </message>
     <message>
diff --git a/i18n/mk/calculator.ts b/i18n/mk/calculator.ts
index 23f53b8..ce18055 100644
--- a/i18n/mk/calculator.ts
+++ b/i18n/mk/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Експериментален Калкулатор</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>М+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -124,28 +120,24 @@
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Калкулатор</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Стандарден</translation>
     </message>
-    <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/mk/calibrate.ts b/i18n/mk/calibrate.ts
index c94cab1..eda4b29 100644
--- a/i18n/mk/calibrate.ts
+++ b/i18n/mk/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Притисни на кртовите цврсто и 
 прецизно за да се калибрира екранот.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добредојдовте во Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/mk/checkbook.ts b/i18n/mk/checkbook.ts
index 592134e..570e6c1 100644
--- a/i18n/mk/checkbook.ts
+++ b/i18n/mk/checkbook.ts
@@ -37,48 +37,24 @@
         <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 type="obsolete">Штедна</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Тековна</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">Кредитна</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Пазар на пари</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Заеднички фонд</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -101,32 +77,24 @@
         <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 type="obsolete">Моментална состојба: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -185,28 +153,24 @@ To sort entries by a specific field, click on the column name.</source>
         <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 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>
@@ -646,105 +610,37 @@ The value entered should always be positive.</source>
 
 Вредноста секогаш теба да биде позитивна.</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 type="obsolete">Автомобил</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Сметки</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">ЦД-а</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Облека</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Компјутер</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVD-а</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Електроника</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Забава</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Храна</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Гориво</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Општо</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Филмпви</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Кирија</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <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 type="obsolete">Работа</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Член на фамилија</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">Општо Кредит</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>Автоматско Плаќање</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Кеш</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/clock.ts b/i18n/mk/clock.ts
index f3b1bc9..d25f77d 100644
--- a/i18n/mk/clock.ts
+++ b/i18n/mk/clock.ts
@@ -31,72 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Одложи</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Саат</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Штоперица</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Ресет</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Намести Аларм</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Намести Датум и време.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Алармопт е вклучен</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Алармот е исклучен</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Саат: Алармот беше пропуштен.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -230,53 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Намести Аларм</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Саат</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Минута</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 аларм</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Одложи (минути)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Сите</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Аудио</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/datebook.ts b/i18n/mk/datebook.ts
index cd2246e..fb9225d 100644
--- a/i18n/mk/datebook.ts
+++ b/i18n/mk/datebook.ts
@@ -334,24 +334,32 @@ Quit anyway?</source>
     <message>
         <source>Office</source>
         <translation>Канцеларија</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категорија:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
@@ -404,66 +412,24 @@ Quit anyway?</source>
     <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>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Саб.
-Сабота</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Нед.
-Недела</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>п</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Време на почеток</translation>
     </message>
     <message>
         <source>End Time</source>
@@ -579,28 +545,24 @@ Quit anyway?</source>
     <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="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>
diff --git a/i18n/mk/embeddedkonsole.ts b/i18n/mk/embeddedkonsole.ts
index 0ea9e12..814b354 100644
--- a/i18n/mk/embeddedkonsole.ts
+++ b/i18n/mk/embeddedkonsole.ts
@@ -1,118 +1,66 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Избор на команди</translation>
     </message>
-    <message>
-        <source>new</source>
-        <translation type="obsolete">нов</translation>
-    </message>
-    <message>
-        <source>edit</source>
-        <translation type="obsolete">уреди</translation>
-    </message>
-    <message>
-        <source>delete</source>
-        <translation type="obsolete">избриши</translation>
-    </message>
-    <message>
-        <source>up</source>
-        <translation type="obsolete">нагоре</translation>
-    </message>
-    <message>
-        <source>down</source>
-        <translation type="obsolete">надоле</translation>
-    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Команди</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Команди&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Препорачани Команди&lt;?B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Микро</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Мал ограничен</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Среден ограничен</translation>
-    </message>
-    <message>
         <source>Command List</source>
         <translation>Листа на Команди</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Покажи листа на команди</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Скриј листа на команди</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Јазичиња доле</translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Јазичиња горе</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Зелено на Црно</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Црно на Бело</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Бело на Црно</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Црно на Прозирно</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Црно на Црвено</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Црвено на Црно</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Зелено на Жолто</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Плаво на Црвено</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Црвено на Плаво</translation>
     </message>
     <message>
@@ -127,36 +75,28 @@
         <source>Blue on Black</source>
         <translation>Плаво на Црно</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Црвено на Црно</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Сопствено</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Фонт</translation>
-    </message>
-    <message>
         <source>Colors</source>
         <translation>Бои</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Нов</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Внеси</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Простор</translation>
     </message>
     <message>
@@ -171,28 +111,24 @@
         <source>Down</source>
         <translation>Надоле</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Залепи</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Уреди</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Ништо</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Лево</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Десно</translation>
     </message>
     <message>
diff --git a/i18n/mk/fifteen.ts b/i18n/mk/fifteen.ts
index 01b23a1..4120e17 100644
--- a/i18n/mk/fifteen.ts
+++ b/i18n/mk/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Растури</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Реши</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Петнаесет Парчиња</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/formatter.ts b/i18n/mk/formatter.ts
index 1cfd02b..cc98c1e 100644
--- a/i18n/mk/formatter.ts
+++ b/i18n/mk/formatter.ts
@@ -13,76 +13,50 @@
         <source>File Systems</source>
         <translation>Податочни Системи</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Формат</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Главен</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">ВНИМАНИЕ:
-Промената на параметрите на оваа
-страна може да предизвикагрешки 
-во функционирањето на системот!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Уреди го fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Провери Диск</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Уред</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Точка на прикачување</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напредни</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Формат?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Да се Форматира
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-со</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">податочен систем?!?
-Ќе ги изгубите сите податоци!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Не</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Неможе да се форматира.
 Непознат тип</translation>
@@ -119,50 +93,36 @@ Device is busy!</source>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Нема таков уред!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 Беше успешно форматиран.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Се обидувам да закачам.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Прикачувањето на картичката беше неуспешно!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-беше успешно прикачена.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Сега можете да го затворите прозорот за излез на податоци.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Внатрешна</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Тип на медиум:</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Вкупно %1 кВ (%d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Искористено %1 кВ (%d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/mk/go.ts b/i18n/mk/go.ts
index dab24a0..985ea5f 100644
--- a/i18n/mk/go.ts
+++ b/i18n/mk/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Нерешено.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>1 обид</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Заробеници: црн %1, бел %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Оди</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/mk/kbill.ts b/i18n/mk/kbill.ts
index 297a7ef..19c4c98 100644
--- a/i18n/mk/kbill.ts
+++ b/i18n/mk/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Датотека</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Помош</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Паузирај игра</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;Приказната&lt;/b&gt;Повторно, судбината на светот е во твои раце! Злобниот хакер, познат по неговиот надимак Били, го има создадено наопасниот компјутерски вирус. Вирус толку моќен што од обичен компјутер може да направи микробранова печка. Били се клонирал во милиони-билиони-трилиони мали  микро-Били. Нивната единствена цел е да го рашират вирусот кој беше паметно маскиран како оперативен систем. Како систем администратор и ектерминатор, твоја работа е да го спречиш Били во неговиот напад.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>Прикаската за кБили</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Правила на кБили</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;Правила&lt;/b&gt;&lt;p&gt;кБили е дизајнирана да може да ја игра било кој во фамилијата. Годините - деновите на тестирање и консултации со најевтините дизајнери резултираа со игра која е лесна за користење, а сепак не наликува на Мекинтош.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Удри го Били (кликни)&lt;/LI&gt;&lt;LI&gt;Рестартирај го компјутерот (кликни)&lt;/LI&gt;&lt;LI&gt;Собери ги украдените оперативни системи &amp; врати ги (влечи) на нивните копјутери &lt;/LI&gt;&lt;LI&gt;Одвлечи ја корпата врз искрите&lt;/LI&gt;&lt;LI&gt;Бодувањето се базира на времето на играње, како и бонусите за убивање Били.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Остатокот највероватно и сами ќе го сватите. Ние го свативме, така да неможе да е толку тешко</translation>
     </message>
     <message>
diff --git a/i18n/mk/keypebble.ts b/i18n/mk/keypebble.ts
index 577c5a6..309bcea 100644
--- a/i18n/mk/keypebble.ts
+++ b/i18n/mk/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>Грешка при читање: QSocket пријав грешка при читање
 на податоците, поврзаниот компјутер највероватно ја
 прекинал врската.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket пријави непозната грешка</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Чекам иницијализаија на серверот...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Чекам име на компјутер...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Поврзано со %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Грешка на протокол: Добиена е порака бр. %1,а се очекува порака за освежување.</translation>
     </message>
     <message>
diff --git a/i18n/mk/launchersettings.ts b/i18n/mk/launchersettings.ts
index 7bbbd98..87a7419 100644
--- a/i18n/mk/launchersettings.ts
+++ b/i18n/mk/launchersettings.ts
@@ -203,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/mk/libbatteryapplet.ts b/i18n/mk/libbatteryapplet.ts
index 699b5b9..8c2c3e9 100644
--- a/i18n/mk/libbatteryapplet.ts
+++ b/i18n/mk/libbatteryapplet.ts
@@ -1,44 +1,32 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Состојба на батерија</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Затвори</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Грешка</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>неможе да се отвори датотека</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Полнење на двата уреда</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Полнење</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Проценти на остнато напојување</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Состојба на батерија:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Добро</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Ниско</translation>
     </message>
     <message>
@@ -57,36 +45,24 @@
         <source>On backup power</source>
         <translation>На помошно напојување</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Вклучено напојување</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Иклучено надворешно напојување</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Останато време</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Проценти на остнато напојување:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Останато време:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Нема додатна батерија</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/libliquid.ts b/i18n/mk/libliquid.ts
index 6b24465..cfc92de 100644
--- a/i18n/mk/libliquid.ts
+++ b/i18n/mk/libliquid.ts
@@ -1,75 +1,68 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">Течен</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">Течен Стил</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Без транспарентност</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Боја на позадина</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Боја на копчиња</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Прозирна боја на позадина</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">прозирна боја на копчиња</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Корисничка порзирност</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Боја на менито</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Боја на текст</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Прозирност</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Користи сенки за текст на мени</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Направи копчињата на палетата да изгледаат рамни</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Контраст</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Течен</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Течен стил со високи перформанси од Моосфет</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libopiepim2.ts b/i18n/mk/libopiepim2.ts
index be24c27..b1b57e6 100644
--- a/i18n/mk/libopiepim2.ts
+++ b/i18n/mk/libopiepim2.ts
@@ -1,132 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Коче календар</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">копче контакти</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">копје мени</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">копје порака</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Копче дома</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">копче сними</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">ротирање на екран</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Подредување:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Разместување:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Вредност:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Црвена:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Зелена:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Плава:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Алфа канал:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Избери боја</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Повеќе</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Повеќе...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Име:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Име</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Тип</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Голем</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Среден</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Мал</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Повторувачки Настан</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Нињто</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Ден</translation>
@@ -325,251 +207,24 @@ and </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>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Повторувачки Настан</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Нињто</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Ден</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Недела</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Месец</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Година</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Секој:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Фрекфенција</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Настан на:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нема краен датум</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Вклучи повторување</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пон</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втор</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Сред</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чет</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Пет</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Саб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Нед</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Пром1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Пром2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">НеделаПром</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нема краен датум</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">денови</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">ден</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">недели</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">недела</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">месеци</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">месец</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">години</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">година</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">и</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-и</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, и</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Без повторување</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">денови</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Вклучи повторување</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пон</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втор</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Сред</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чет</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Пет</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Саб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Нед</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">недели</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Повторувај по</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Ден</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">датум</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">месеци</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">години</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Време:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Одбери Време:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -623,68 +278,26 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Диалог на датотеки</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Отвори</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Сними</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Стил</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Документи</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Датотеки</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">Сите пораки</translation>
-    </message>
-    <message>
         <source>Description:</source>
         <translation type="unfinished">Опис:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Многу високо</translation>
     </message>
     <message>
@@ -711,56 +324,48 @@ and </source>
         <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>
     </message>
     <message>
         <source>Business Web Page: </source>
         <translation>Службена интернет страна:</translation>
     </message>
     <message>
         <source>Business Phone: </source>
         <translation>Службен Телефон:</translation>
     </message>
     <message>
         <source>Business Fax: </source>
         <translation>Службен факс:</translation>
     </message>
     <message>
         <source>Business Mobile: </source>
         <translation>Службен Мобилен:</translation>
     </message>
     <message>
         <source>Business Pager: </source>
         <translation>Службен Пејџер:</translation>
     </message>
     <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
-    </message>
-    <message>
         <source>Home Web Page: </source>
         <translation>Приватна Интернет страна:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Домашен Телефон:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Домашен Факс:</translation>
     </message>
     <message>
@@ -847,28 +452,24 @@ 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>
diff --git a/i18n/mk/libopieui2.ts b/i18n/mk/libopieui2.ts
index 23f5c13..01d0698 100644
--- a/i18n/mk/libopieui2.ts
+++ b/i18n/mk/libopieui2.ts
@@ -1,382 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Коче календар</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">копче контакти</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">копје мени</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">копје порака</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Копче дома</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">копче сними</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">ротирање на екран</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Подредување:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Разместување:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Вредност:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Црвена:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Зелена:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Плава:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Алфа канал:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Избери боја</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Повеќе</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Повеќе...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Диалог на датотеки</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Отвори</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Сними</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Име:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Име</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Тип</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Голем</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Среден</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Мал</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Стил</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">Кафеавата лисица рипа преку мрзливото куче</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Име</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Повторувачки Настан</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Нињто</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Ден</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Недела</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Месец</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Година</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Секој:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Фрекфенција</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Настан на:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нема краен датум</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Вклучи повторување</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пон</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втор</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Сред</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чет</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Пет</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Саб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Нед</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Пром1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Пром2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">НеделаПром</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нема краен датум</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">денови</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">ден</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">недели</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">недела</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">месеци</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">месец</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">години</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">година</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">и</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-и</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, и</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Без повторување</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">денови</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Вклучи повторување</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пон</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втор</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Сред</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чет</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Пет</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Саб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Нед</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">недели</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Повторувај по</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Ден</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">датум</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">месеци</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">години</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Секој</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>
@@ -505,293 +137,39 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Име</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Големина</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Тип</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>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Приоритет:</translation>
-    </message>
-    <message>
-        <source>Very high</source>
-        <translation type="obsolete">Многу високо</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Висок</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Нормално</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Низок</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Многу ниско</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Напредок:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Краен рок:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Категорија:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Основна 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 type="obsolete">Канцеларија:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Службена интернет страна:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Службен Телефон:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Службен факс:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Службен Мобилен:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Службен Пејџер:</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Домашна Адреса:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Приватна Интернет страна:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Домашен Телефон:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Домашен Факс:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Приватен Мобилен:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Сите електронски писма:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Професија:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Асистент:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Менаџер:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Машки</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Женски</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Пол:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Сопруг/Сопруга:</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Роденден:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Годишнина:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Деца:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Надимак:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Забелешки:</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Локација:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Ова е настан за цел ден</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Ова е настан од повеќе денови</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Старт:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Крај:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Забелешка:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 секој</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">%1 секој</translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">%1 %1 од секој</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Понеделник</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Вторник</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Среда</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Четврток</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Петок</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Сабота</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Недела</translation>
-    </message>
-    <message>
-        <source>The %1 %2 of every</source>
-        <translation type="obsolete">%1 %2 од секој</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Нињто</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">st</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">nd</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">rd</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">th</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/libqpe.ts b/i18n/mk/libqpe.ts
index a993690..e1c76b9 100644
--- a/i18n/mk/libqpe.ts
+++ b/i18n/mk/libqpe.ts
@@ -185,28 +185,24 @@ editing categories.</source>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Стригот не е пронајден.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Стигнав до крајк, повторно почнувам од почеток</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Пронајди</translation>
     </message>
     <message>
@@ -415,44 +411,24 @@ editing categories.</source>
     <message>
         <source>No</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>New Document</source>
         <translation>Нов Документ</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Кликни за да го затвориш овој прозорец, занемарувајќи ги промените.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Кликни за да го затвориш овој прозорец.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Кликни за да го затвориш овој прозорец, памтејќи ги промените.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Кликни за да можеш да го поместуваш прозорецов.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Кликни за проорецот да ја покрие целата површина на екранот.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Ot&gt;Нема детална  помош за оваа апликација&lt;p&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Што е ова...</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Нема доволно простор</translation>
     </message>
     <message>
@@ -475,32 +451,24 @@ Please free up some space
 before entering data</source>
         <translation>Неможе да се креираат стартните датотеки
 Ослободете простор 
 пред да внесувате податоци</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Неможе да се намести алармот.
 Ослободете меморија и обидете се повторно.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">Д</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">М</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>Г</translation>
     </message>
     <message>
         <source>day</source>
         <translation>ден</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месец</translation>
     </message>
     <message>
@@ -535,30 +503,24 @@ Free some memory and try again.</source>
         <source>Fri</source>
         <translation>Пет</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Саб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Нед</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Дали сакате да го избришете 
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Сите</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Не е внесено</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Работна Адреса:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -862,28 +824,24 @@ Free some memory and try again.</source>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Грешка</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">Д</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">М</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/mk/libtodayaddressbookplugin.ts b/i18n/mk/libtodayaddressbookplugin.ts
index 79965f2..9a47150 100644
--- a/i18n/mk/libtodayaddressbookplugin.ts
+++ b/i18n/mk/libtodayaddressbookplugin.ts
@@ -1,44 +1,32 @@
 <!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 type="obsolete">Скрати линија по Х карактери:</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">После колку карактери информацијата за настанот би требало да биде скратена</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>
-    </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>
diff --git a/i18n/mk/libtodaydatebookplugin.ts b/i18n/mk/libtodaydatebookplugin.ts
index afa4c98..ef30237 100644
--- a/i18n/mk/libtodaydatebookplugin.ts
+++ b/i18n/mk/libtodaydatebookplugin.ts
@@ -6,83 +6,24 @@
         <translation>[со аларм]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>Забелешка</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Прикажи локација</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Провери дали оваа локација на состанмок треба да се прикаже за секој</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Прилажи забелешки</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Одблежи ако забелешката прикаченма за некој состаноок треба да биде прикажана за секој од нив</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Прикажи ги само 
-последните состаноци</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Одбери го ова само ако состаноците кои се закажани за подоцна треба да бидат покажани</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Кокли
-состаноци
-треба да бидат
-прикажани?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Колку состаноци треба да бидат прикажани. Распоредени по време</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Уште колку денови</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Колку денови треба да бидат во опсегот</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">денови</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">само денес</translation>
-    </message>
-</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>
diff --git a/i18n/mk/libtodaytodolistplugin.ts b/i18n/mk/libtodaytodolistplugin.ts
index c7bd99d..7f0d2ed 100644
--- a/i18n/mk/libtodaytodolistplugin.ts
+++ b/i18n/mk/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <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>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">Прикажани задачи</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Подеси го максимумот на зачи кои треба да бидат прикажани</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Скрати ја линијата по Х карактеро</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">После колку карактери информацијата треба да се скрати</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/mk/libtodayweatherplugin.ts b/i18n/mk/libtodayweatherplugin.ts
index e5d4455..64f4ce0 100644
--- a/i18n/mk/libtodayweatherplugin.ts
+++ b/i18n/mk/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Pres: </source>
         <source>SE </source>
         <translation>ЈИ</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>Км/Ч</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>М/ч</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">хПа</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/libwlan.ts b/i18n/mk/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/mk/libwlan.ts
+++ b/i18n/mk/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/mk/mindbreaker.ts b/i18n/mk/mindbreaker.ts
index 98a674f..0112297 100644
--- a/i18n/mk/mindbreaker.ts
+++ b/i18n/mk/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>просек на победи: %1 обиди (%2 игри)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Оди %1п%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">Моментален Пат %1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Одговор %1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Ресетирај статистики</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Ресетирај го бројот на победи?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
diff --git a/i18n/mk/minesweep.ts b/i18n/mk/minesweep.ts
index 162943d..9496506 100644
--- a/i18n/mk/minesweep.ts
+++ b/i18n/mk/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Победа!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Експлозија!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Лов на мини</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Почетник</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Напреден</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Експерт</translation>
     </message>
     <message>
diff --git a/i18n/mk/opie-eye.ts b/i18n/mk/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/mk/opie-eye.ts
+++ b/i18n/mk/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/opie-login.ts b/i18n/mk/opie-login.ts
index 93d5d9a..77c1053 100644
--- a/i18n/mk/opie-login.ts
+++ b/i18n/mk/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Притиснете на крстовите цврсто и 
 прецизно за да го калибрирате екранот.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добредојдовте во 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>
@@ -41,53 +37,36 @@ accurately to calibrate your screen.</source>
 </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 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>
diff --git a/i18n/mk/opiemail.ts b/i18n/mk/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/mk/opiemail.ts
+++ b/i18n/mk/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/mk/osearch.ts b/i18n/mk/osearch.ts
index 92ab2d2..f67a258 100644
--- a/i18n/mk/osearch.ts
+++ b/i18n/mk/osearch.ts
@@ -1,64 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>OПребарување</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Детали за моменталниот резултат</translation>
     </message>
     <message>
-        <source>applications</source>
-        <translation type="obsolete">апликации</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="obsolete">документи</translation>
-    </message>
-    <message>
-        <source>todo</source>
-        <translation type="obsolete">задолжениа</translation>
-    </message>
-    <message>
-        <source>datebook</source>
-        <translation type="obsolete">роковник</translation>
-    </message>
-    <message>
-        <source>adressbook</source>
-        <translation type="obsolete">адресар</translation>
-    </message>
-    <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 type="obsolete">Внимавај на големи и мали букви</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>
@@ -91,36 +67,24 @@
     </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 type="obsolete">прикажи завршени задачи</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">прикажи изминати настани</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">барај во датуми</translation>
-    </message>
-    <message>
         <source>show</source>
         <translation>прикажи</translation>
     </message>
     <message>
         <source>edit</source>
         <translation>уреди</translation>
     </message>
     <message>
         <source>execute</source>
         <translation>изврши</translation>
     </message>
     <message>
@@ -135,28 +99,24 @@
         <source>Link: </source>
         <translation>Врска:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Тип:</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>отвори со</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">пребарај содржина</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>пребарување %1</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>
diff --git a/i18n/mk/oxygen.ts b/i18n/mk/oxygen.ts
index 064d8da..ca1d12e 100644
--- a/i18n/mk/oxygen.ts
+++ b/i18n/mk/oxygen.ts
@@ -64,40 +64,28 @@
         <source>Group</source>
         <translation>Група</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Негативност на елекрон</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Радиус на атом</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Енергија на јонизација</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Густина</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Точка на ротација</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Точка на сретнување</translation>
-    </message>
-    <message>
         <source>Ionization Energy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/patience.ts b/i18n/mk/patience.ts
index 48700c3..54f2e7c 100644
--- a/i18n/mk/patience.ts
+++ b/i18n/mk/patience.ts
@@ -17,68 +17,44 @@
         <source>Harp</source>
         <translation>Харп</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>клуб</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Игра</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Смени Карти</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Залепи за позиција</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Подесувања</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;За</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Помош</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Играј</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Смени Карти</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Залепи за позиција</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">сврти една карта</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Подесувања</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Сврти три карти</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/mk/qpe.ts b/i18n/mk/qpe.ts
index a747a78..b9e976b 100644
--- a/i18n/mk/qpe.ts
+++ b/i18n/mk/qpe.ts
@@ -57,97 +57,31 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Проблем со апликацијата</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 не одговара&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Присилно да се иклучи апликацијата?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">Кликни на крстовите цврсто и 
 прецизно за да го калибрираш екранот.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добредојде во Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Документи</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Преглед по икони</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Преглед по листа</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Нивото на батеријата е критично!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">Нивото на батеријата е многу ниско.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Помошната батерија е многу слаба.
-Наполни ја помошната батерија.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">Визиткарта</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Информации</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Датумот на системот не е валиден.
-(%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">Состојба на батерија</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -183,32 +117,24 @@ Please charge the back-up battery.</source>
     <message>
         <source>Unicode</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation type="unfinished">Стартувач</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Барање документи</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Пребарување на документи</translation>
-    </message>
-    <message>
         <source> - Launcher</source>
         <translation type="unfinished">- Стартувач</translation>
     </message>
     <message>
         <source>No application</source>
         <translation type="unfinished">Нема Апликација</translation>
     </message>
     <message>
         <source>&lt;p&gt;No application is defined for this document.&lt;p&gt;Type is %1.</source>
         <translation type="unfinished">&lt;p&gt;Нема апликација дефинирана за овој документ.&lt;p&gt;Типот е %1.</translation>
     </message>
     <message>
@@ -237,107 +163,44 @@ Please charge the back-up battery.</source>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 датотеки</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">Аите типови на датотека</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">Преглед на документи</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Внесен медиум</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">А &lt;b&gt;медиумот&lt;/b&gt;  е внесен. Да се скенира за мултимедијални датотеки?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Кои датотеки</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Аудио</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Слика</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Текст</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Видео</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Сите</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Поврзи апликации</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Ограничи пребарување надиректориум: (сеуште не се користи)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Додај</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">Твојата одлука ќе биде снимена на медиумот.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">Не го барај овој медиум пак</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Кои датотеки</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">Аудио</translation>
@@ -371,31 +234,24 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">Состојба на батерија</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -423,35 +279,24 @@ Please charge the back-up battery.</source>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">Информации</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;Датумот на системот не е валиден.
 (%1)&lt;/p&gt;&lt;p&gt;Да се поправи саатот ? &lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Нивото на батеријата е критично!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Помошната батерија е многу слаба.
-Наполни ја помошната батерија.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">Визиткарта</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -516,77 +361,55 @@ immediately.</source>
         <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="obsolete">&lt;p&gt;
-Овие иоции за гасење се наменети за користење за време на развој и тестирање на Опие системот. Во нормална околина, овие концепти се непотребни.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Откажи</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">Врска за синхронизирање</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Неавторизиран систем бара да се поврзе со овој уред.&lt;p&gt;Aко користите веризја на Qtopia постара од 1.5.1 надградете ја.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished">Одбиј</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;Непознат систем бара да се поврзе со овој уред.&lt;p&gt;Aко првпат го имате инсталирано Sync ова е нормално.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">Дозволи</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Синхронизирање</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Контакти&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Откажи</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/security.ts b/i18n/mk/security.ts
index 8b4ec6f..42e0134 100644
--- a/i18n/mk/security.ts
+++ b/i18n/mk/security.ts
@@ -65,48 +65,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">Синхронизирај</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24 </translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/24 </translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">Секој</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Ништо</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,152 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Намести лозинја</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Смени лозинка</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Внеси лозинка</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Неточна лозинка</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Лозинката не е точна.
-Одбиен пристап</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ништо</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Внеси нова лозинка</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Повтторно внеси лозинка</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24 </translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/24 </translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Сигурносни подесувања</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Смени лозинка</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Избриши лозинка</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Барај лозинка на подигање</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Синхронизирај</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Прифати синхронизација од мрежа:</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (основна)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24 </translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/24 </translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Секој</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ништо</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;p&gt; Заштитата со лозинка дава минимални ниво на заштита од повремен пристап до уредот.</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</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>
diff --git a/i18n/mk/snake.ts b/i18n/mk/snake.ts
index 6e46fe7..2c22076 100644
--- a/i18n/mk/snake.ts
+++ b/i18n/mk/snake.ts
@@ -13,38 +13,30 @@
         <source>SNAKE!</source>
         <translation>ЗМИЈА!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Користи ги стрелките за да ја управуваш
 смијата да го изеде глувчето. Не смееш да
 се удриш во зидовите, на краевите од екранот или опашката.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Притисни копче за Старт</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>Резултат: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>КРАЈ!!! Резултат: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Притисни копче за Нова Игра.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/mk/sysinfo.ts b/i18n/mk/sysinfo.ts
index 957a780..118f753 100644
--- a/i18n/mk/sysinfo.ts
+++ b/i18n/mk/sysinfo.ts
@@ -122,40 +122,24 @@
     <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 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>
@@ -187,57 +171,48 @@ Memory is categorized as follows:
         <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>
-    <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>
     <message>
@@ -287,29 +262,24 @@ Click and hold on a process to see additional information about the process, or
         <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>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>
@@ -359,32 +329,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Модел:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/mk/tableviewer.ts b/i18n/mk/tableviewer.ts
index 2f6b123..b02359b 100644
--- a/i18n/mk/tableviewer.ts
+++ b/i18n/mk/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">Листа на клучеви::ДодајКлуч() Немпже да се внесе основна вредност за тип %1. Клучот не е додаден.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">ПодатокЕлемент::ПоставиПоле(%1 %2) Не е пронајден валиден тип</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Ресетирај</translation>
     </message>
     <message>
         <source>key</source>
         <translation>клуч</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/mk/today.ts b/i18n/mk/today.ts
index 70d750c..e38f3b3 100644
--- a/i18n/mk/today.ts
+++ b/i18n/mk/today.ts
@@ -9,28 +9,24 @@
         <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 type="obsolete">Нема додатоци</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>Нема активни додатоци</translation>
     </message>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -67,72 +63,24 @@
         <source>Move Up</source>
         <translation>Помести нагоре</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Помести надоле</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>активно/редослед</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">автоматско стартување на 
-продолжување?
-(само за Opie)</translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Избери ако „Денес“ треба автомтски да се стартува.</translation>
-    </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Мал банер</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">минути неактивност</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Колку минути терминалот беше суспендиран пред модулот за авотстарт продолжил</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">големина на икона</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Намести големина на икони</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Освежување</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Колку често треба „Денес“ да се освежува</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">сек</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">никогаш</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Општо</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
diff --git a/i18n/mk/todolist.ts b/i18n/mk/todolist.ts
index 3ac8538..b3759db 100644
--- a/i18n/mk/todolist.ts
+++ b/i18n/mk/todolist.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ок</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="obsolete">&lt;h1&gt;Аларм на %0 &lt;h1&gt;&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation type="unfinished">&lt;h1&gt;Аларм на %1 &lt;h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Незапишано</translation>
     </message>
 </context>
@@ -84,198 +80,114 @@
     <message>
         <source>silent</source>
         <translation>тивок</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>Гласен</translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Нова од поставка</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Нова задала</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Кликни овде за да се зададе нова задача.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Уреди Задача</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Кликни овде за да се измени задачата.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Види Задача</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Избриши...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Кликни овде за да ја отстраниш моменталната задача.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Избриш се...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Избриши завршени</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Дуплирај</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">Пренеси</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Кликни овде за да ја пренесеш оваа задача на нов уред.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Најди</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Покажи завршени задачи</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Покажи само задалчи со прекорачан рок</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Покажи крајни рокови</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Покажи палета</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Податоци</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Категорија</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Брзо Уредување</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Ова е листа на задачи.
 
 Листата ги прикажува следните информации:
 1. Завршени - одбележани со зелено.Кликни овде за да се заврши некоја задача.
 2. Приоритет - Графичка репрезентација на приоритетот на задачата. Кликни двапати за да се измени.
 3. Опис - Опис на задачата. Кликни овде за да се избере задачата.
 4. Краен рок - крајниот рок на задачата.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Сите категории</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Незапишано</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Нема простор</translation>
     </message>
     <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 type="obsolete">Опис</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Краен рок</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">Подеси поставки</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>
@@ -493,28 +405,24 @@ It allows you to quickly add a new task to your list.  This area can be shown or
         <source>Select category to organize this task with.</source>
         <translation>Избери категорија.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Повторувачка задача</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Кликни овде ако задачата се повтрува. </translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">ЗабелеШки:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Овде внеси додатни информации за задачата.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Листа на задачи</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/mk/usermanager.ts b/i18n/mk/usermanager.ts
index 31ad163..ef6aacf 100644
--- a/i18n/mk/usermanager.ts
+++ b/i18n/mk/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>Додади група</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Уреди група</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE менаџер на корисници</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Додади корисник</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/mk/zsafe.ts b/i18n/mk/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/mk/zsafe.ts
+++ b/i18n/mk/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/nl/addressbook.ts b/i18n/nl/addressbook.ts
index 2ad436c..621e725 100644
--- a/i18n/nl/addressbook.ts
+++ b/i18n/nl/addressbook.ts
@@ -19,179 +19,93 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Ongeklassificeerd</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contacten</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Contact</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nieuw</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Wijzig</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Verwijder</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Vind</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Schrijf mail aan</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Stuur via IR</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Mijn persoonlijke gegevens</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Bekijk</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Kan niet wijzigen tijdens synchronisatie</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Wijzig persoonlijke gegevens</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Wijzig adres</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contacten - Mijn persoonlijke gegevens</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Geen ruimte</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Kan niet opslaan.
 Maak ruimte en probeer het opnieuw.
 
 Toch stoppen?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Ongeklassificeerd</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importeer vCard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Sluit Vind</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Sla alles op</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Configureer</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Niet gevonden</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Lijst</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Kaartjes</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Kaart</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Start zoeken</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Juist bestandstype?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Ja</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nee</translation>
     </message>
     <message>
-        <source>Unable to find a contact for this 
- search pattern!</source>
-        <translation type="obsolete">Kan niets vinden dat voldoet
- aan de zoekterm!</translation>
-    </message>
-    <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Het geselecteerde bestand 
  eindigt niet op &quot;.vcf&quot;.
  Wilt u het alsnog openen?</translation>
     </message>
     <message>
         <source>Add Contact?</source>
         <translation>Contact toevoegen?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Wilt U inderdaad een contact
 toevoegen voor %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp; Ja op alles</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Exporteer vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>U moet een contact selecteren!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>U moet een bestandsnaam selecteren!</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Kan geen kontakt vinden met dit zoekpatroon!</translation>
     </message>
     <message>
@@ -1390,180 +1304,13 @@ geleverd!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Exporteer vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Mijn persoonlijke gegevens</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Telefoon werk</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax werk</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Mobiel werk</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Standaard email</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Emails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Telefoon prive</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax prive</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Mobiel prive</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Kantoor</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Beroep</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistent</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Manager</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Echtgeno(o)t(e)</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Geslacht</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Verjaardag</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Jaardag</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Bijnaam</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Kinderen</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Titel</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Voornaam</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Tussenvoegsel</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Achternaam</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Achtervoegsel</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Sla op als</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Functie</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Afdeling</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Bedrijf</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Bedrijf adres</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Bedrijf woonplaats</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Bedrijf provincie</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Bedrijf Postcode</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Bedrijf land</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Bedijf pieper</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Bedrijf website</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Prive adres</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Prive woonplaats</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Prive provincie</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Prive postcode</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Prive land</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Prive website</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notities</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/nl/advancedfm.ts b/i18n/nl/advancedfm.ts
index 53d0eeb..60bc8c9 100644
--- a/i18n/nl/advancedfm.ts
+++ b/i18n/nl/advancedfm.ts
@@ -1,34 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Notitie</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Deze map bestaat niet</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-copyright 2002-2003
-L.J.Potter &lt;llorncor@handhelds.org&gt;
-en valt onder de GPL</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Vertoon verborgen bestanden</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Verander van map</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Voer uit</translation>
     </message>
     <message>
@@ -131,96 +117,48 @@ en valt onder de GPL</translation>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">%1 bestanden
-echt verwijderen?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Verwijder map?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">%1 bestanden
-echt kopiëren?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Bestand bestaat al!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 Bestaat al, Overschrijven?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Kon %1 niet naar %2 kopiëren</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">bestaat. Overschrijven?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Kan niet kopiëren
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">naar</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Kopiëer</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Als</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">bestaat al.
-Wilt u het echt verwijderen?</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Kan niet verplaatsen
-</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>AdvancedFm Uitvoer</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>AdvancedFm IR uit</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>IR verzonden.</translation>
     </message>
     <message>
@@ -235,69 +173,40 @@ Wilt u het echt verwijderen?</translation>
         <source>Could not rename</source>
         <translation>Kan bestand niet hernoemen</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>AdvancedFM ::</translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>kB vrij</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">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 type="obsolete">%1 en alle inhoud
-echt verwijderen?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">%1
-echt verwijderen?</translation>
-    </message>
-    <message>
         <source>Switch to View 1</source>
         <translation>Schakel naar venster 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Schakel naar venster 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Nog niet in gebruik</translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="obsolete">Kon niet van
-%1 naar
-%2 kopieren</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/nl/appearance.ts b/i18n/nl/appearance.ts
index f56f8a8..6fa5f8f 100644
--- a/i18n/nl/appearance.ts
+++ b/i18n/nl/appearance.ts
@@ -61,64 +61,24 @@ Klik hier om een kleurschema te kiezen.</translation>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klik hier om het links aangegeven kleurschema te verwijderen.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Sla op</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klik hier om het huidige schema onder een naam op te slaan.</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Verplicht schema voor alle programma&apos;s.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Klik hier om toe te staan dat alle programma&apos;s de algemene stijlinstellingen gebruiken.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Zet stijlinstellingen uit voor deze programma&apos;s (&lt;b&gt;*&lt;/b&gt; kan worden gebruikt als jokerteken):</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Als sommige applicaties niet goed werken met de algemene stijlinstellingen, kunt u hier onderdelen ervan uitschakelen voor dat programma.
-
-Dit gedeelte geeft de mogelijkheid een programma te selecteren en de uit te schakelen instellingen te kiezen.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binaire bestanden</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Klik hier om een programma aan de lijst hierboven toe te voegen.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Klik hier om het geselecteerde programma te verwijderen.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Klik hier om het geselecteerde programma hoger in de lijst te zetten.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Klik hier om het geselecteerde programma lager in de lijst te zetten.</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Tab stijl:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klik hier om de gewenste stijl voor programa&apos;s met tabbladen(zoals deze) te kiezen. De bechikbare stijlen zijn:
 
@@ -183,64 +143,44 @@ Dit gedeelte geeft de mogelijkheid een programma te selecteren en de uit te scha
         <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 type="obsolete">Herstart</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Wil je %1 nu herstarten?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&lt;nieuw&gt;</translation>
-    </message>
-    <message>
         <source>Show Scrollbars on the left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
diff --git a/i18n/nl/aqpkg.ts b/i18n/nl/aqpkg.ts
index 87621d3..3b91144 100644
--- a/i18n/nl/aqpkg.ts
+++ b/i18n/nl/aqpkg.ts
@@ -197,56 +197,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Kan statusbestand niet openen - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Kan tijdelijk statusbestand niet maken - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Kan ipkg proces niet starten</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Kan niet openen:</translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Maak map aan</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Link gemaakt van %1 naar %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Link van %1 naar %2 mislukt</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Verwijderd %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">%1 verwijderen mislukt</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Verwijderd</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Verwijderen mislukt</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
@@ -508,42 +476,34 @@ pakket %1?</translation>
         <translation>Wilt u verwijdering of herinstallatie van
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Verwijdering of Herinstallatie</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Herinstalleer</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Wilt u verwijdering of vernieuwing van
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Verwijdering of Vernieuwing</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">U</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Vernieuwen Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Omschrijving&lt;/b&gt; -</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/nl/backup.ts b/i18n/nl/backup.ts
index 4139daa..f95f7b7 100644
--- a/i18n/nl/backup.ts
+++ b/i18n/nl/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Backup en herstel, voortgang....</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Backup en herstel</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Fout van systeem:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Bericht</translation>
@@ -27,44 +23,36 @@
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Details</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Backup en Herstel is mislukt!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Backup succesvol.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Selecteer iets om te herstellen.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Herstel mislukt.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Kan bestand %1 niet openen</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Herstel sucsesvol.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation>Backup gelukt.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Herstel gelukt.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -98,52 +86,44 @@
         <source>Backup And Restore</source>
         <translation>Backup en herstel</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Backup</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programma&apos;s</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Opslaan in</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Backup</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Herstel</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Selecteer bron</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolom 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>He&amp;rstel</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Bestandenlijst vernieuwen</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/nl/calculator.ts b/i18n/nl/calculator.ts
index 5bcd01a..b9210bc 100644
--- a/i18n/nl/calculator.ts
+++ b/i18n/nl/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Experimentele rekenmachine</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -123,28 +119,24 @@
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Rekenmachine</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
-    <message>
-        <source>Calculator</source>
-        <translation type="obsolete">Rekenmachine</translation>
-    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standaard</translation>
     </message>
     <message>
         <source>Weight</source>
         <translation>Gewicht</translation>
     </message>
     <message>
diff --git a/i18n/nl/calibrate.ts b/i18n/nl/calibrate.ts
index a2430bd..36cad86 100644
--- a/i18n/nl/calibrate.ts
+++ b/i18n/nl/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Raak de richtkruisen duidelijk en
 precies aan om uw scherm te calibreren.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Welkom bij Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/nl/checkbook.ts b/i18n/nl/checkbook.ts
index 4acd1b5..055cabc 100644
--- a/i18n/nl/checkbook.ts
+++ b/i18n/nl/checkbook.ts
@@ -37,48 +37,24 @@
         <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 type="obsolete">Spaargeld</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Cheques</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">Belastingen</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Geldmarkt</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Aandelen</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -101,32 +77,24 @@
         <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 type="obsolete">Huidig saldo: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -185,28 +153,24 @@ Klik op de kolomnaam om te sorteren op een bepaald veld. </translation>
         <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 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>
@@ -645,109 +609,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Auto</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Vaste lasten</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CD&apos;s</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Kleding</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Computer</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVD&apos;s</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Electronica</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Amusement</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Eten/Drinken</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Benzine</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Overig</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Films</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Huur</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <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 type="obsolete">Werk</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Familie</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <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 type="obsolete">Electronisch</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/nl/clock.ts b/i18n/nl/clock.ts
index 102000e..f17b418 100644
--- a/i18n/nl/clock.ts
+++ b/i18n/nl/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Sluimer</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Klok</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Stopwatch</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Stel alarm in</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Stel datum en tijd in.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarm staat aan</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarm staat aan</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Klok: Alarmtijd is verstreken</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarm ingesteld op: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -234,53 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Stel alarm in</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Uur</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuut</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">MP3 alarm</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Sluimertijd (minuten)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Geluid</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/nl/datebook.ts b/i18n/nl/datebook.ts
index 891f91f..dd5758c 100644
--- a/i18n/nl/datebook.ts
+++ b/i18n/nl/datebook.ts
@@ -333,24 +333,32 @@ Toch afsluiten?</translation>
     <message>
         <source>Office</source>
         <translation>Kantoor</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Thuis</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorie:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -405,111 +413,27 @@ Weekdagen</translation>
     <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>
-        <translation type="obsolete">D
-
-Donderdag</translation>
-    </message>
-    <message>
-        <source>F</source>
-        <comment>Friday</comment>
-        <translation type="obsolete">V
-
-Vrijdag</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Z
-
-Zaterdag</translation>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Z
-
-Zondag</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
-    <message>
-        <source>Mo</source>
-        <comment>Monday</comment>
-        <translation type="obsolete">Ma</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">Wo</translation>
-    </message>
-    <message>
-        <source>Th</source>
-        <comment>Thursday</comment>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fr</source>
-        <comment>Friday</comment>
-        <translation type="obsolete">Vr</translation>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Za</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Zo</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Aanvangstijd</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Eindtijd</translation>
     </message>
     <message>
@@ -622,28 +546,24 @@ Zondag</translation>
     <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="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>
diff --git a/i18n/nl/embeddedkonsole.ts b/i18n/nl/embeddedkonsole.ts
index ade1906..2613feb 100644
--- a/i18n/nl/embeddedkonsole.ts
+++ b/i18n/nl/embeddedkonsole.ts
@@ -19,80 +19,48 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Gesuggereedre Commando&apos;s&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Heel klein</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Klein Vast</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Middel Vast</translation>
-    </message>
-    <message>
         <source>Command List</source>
         <translation>Commandolijst</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Geef commandolijst weer</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Verberg commandolijst</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Tabs onderaan</translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Tabs bovenaan</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Groen op Zwart</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Zwart op Wit</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Wit op Zwart</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Zwart op transparant</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Zwart op Rood</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rood op Zwart</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Groen op Geel</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Blauw op Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta op Blauw</translation>
     </message>
     <message>
@@ -107,36 +75,28 @@
         <source>Blue on Black</source>
         <translation>Blauw op Zwart</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Amber op Zwart</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>Aangepast</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Lettertype</translation>
-    </message>
-    <message>
         <source>Colors</source>
         <translation>Kleuren</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Opties</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nieuw</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Voer in</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spatie</translation>
     </message>
     <message>
@@ -151,28 +111,24 @@
         <source>Down</source>
         <translation>Omlaag</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Plak</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Snelverandering</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Verander</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Links</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Rechts</translation>
     </message>
     <message>
diff --git a/i18n/nl/fifteen.ts b/i18n/nl/fifteen.ts
index ad31471..2e97595 100644
--- a/i18n/nl/fifteen.ts
+++ b/i18n/nl/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Hussel</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Los op</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Spel</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Schuifpuzzel</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/formatter.ts b/i18n/nl/formatter.ts
index 4b396b2..ff467bf 100644
--- a/i18n/nl/formatter.ts
+++ b/i18n/nl/formatter.ts
@@ -13,77 +13,50 @@
         <source>File Systems</source>
         <translation>Filesystemen</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Formatteer</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Startpunt</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">WAARSCHUWING:
-Het veranderen van opties op
-deze pagina kan ervoor zorgen
-dat uw system niet meer goed
-functioneert!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Wijzig fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Controleer Disk</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Mount punt</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Geavanceerd</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Formatteren?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Echt Formatteren
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-met</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">bestandssysteem?!?
-Alle data zal verloren gaan!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Kan niet formatteren.
 Onbekend type</translation>
@@ -120,50 +93,36 @@ Apparaat is bezig!</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Dit apparaat bestaat niet!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 is succcesvol geformatteerd.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Probeer te mounten.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Kaart mount mislukt!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-is sucsesvol gemount.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>U kunt nu het uitvoerscherm sluiten.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Intern</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Opslagsoort :</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Totaal %1 kB (%d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Gebruikt: %1 ( %d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/nl/go.ts b/i18n/nl/go.ts
index c7c23c5..5b410b3 100644
--- a/i18n/nl/go.ts
+++ b/i18n/nl/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Gelijkspel.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Ik pas</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Gevangen: zwart %1, wit %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Go</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/nl/helpbrowser.ts b/i18n/nl/helpbrowser.ts
index fe5e15e..4a8c151 100644
--- a/i18n/nl/helpbrowser.ts
+++ b/i18n/nl/helpbrowser.ts
@@ -21,21 +21,17 @@
         <source>Remove from Bookmarks</source>
         <translation>Verwijder bookmark</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Bookmarks</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Hulp bij Hulp</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation type="obsolete">Helppagina&apos;s</translation>
-    </message>
-    <message>
         <source>Go</source>
         <translation>Ga</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/kbill.ts b/i18n/nl/kbill.ts
index 2b7a421..12a7f56 100644
--- a/i18n/nl/kbill.ts
+++ b/i18n/nl/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Bestand</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hulp</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pauzeer spel</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;Het Verhaal&lt;/b&gt;&lt;p&gt;Het lot van de wereld ligt alweer in jouw handen! Een gemene computerspecialist, die bekend staat onder de schuilnaam &apos;Bill&apos;, heeft het ultieme computervirus gecreerd. Een zo geavanceerd virus dat het in staat is een gewone computer te veranderen in een nutteloos fossiel! &apos;Bill&apos; heeft zichzelf gekloond tot miljarden micro-Bill&apos;s. Hun enige doel is het infecteren met dit gruwelijke virus, dat vermomd is als een populair besturingssysteem. Als systeembeheerder en ongediertebestrijder is het jouw taak te voorkomen dat Bill hierin slaagt.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>Het verhaal van kBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>De regels van kBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;De Regels&lt;/b&gt;&lt;p&gt;Na jaren, nee dagen van minutieus onderzoek - met behulp van de goedkoopste programmeurs die er te vinden zijn -  naar de meest makkelijke weergave, is het ons mogelijk gebleken dit programma zo eenvoudig te maken dat het geschikt is voor de hele familie, en de huiskat, en toch niet te laten lijken op een Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Mep de Bill&apos;s (klik)&lt;/LI&gt;&lt;LI&gt;Herstart de computer (klik)&lt;/LI&gt;&lt;LI&gt;Pak de gestolen OSen op &amp; en breng ze terug (sleep) ze naar hun respectievelijjke computers&lt;/LI&gt;&lt;LI&gt;Sleep de emmer om brandjes te blussen&lt;/LI&gt;&lt;LI&gt;Scores zijn gebaseerd op stbiliteit van het computersysteem, met bonussen voor het meppen van de Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;De rest kun je vast zelf wel uitvissen. Ons lukte het, dus jou vast ook wel.</translation>
     </message>
     <message>
diff --git a/i18n/nl/keypebble.ts b/i18n/nl/keypebble.ts
index 57eb7f1..99cf4a0 100644
--- a/i18n/nl/keypebble.ts
+++ b/i18n/nl/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>Leesfout: QSocket geeft een fout bij het lezen van
 data, de computer aan de andere kant heeft
 de verbiding verbroken.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket geeft een verkeerde foutcode</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Wacht op server initialisatie...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Wacht op bureaubladnaam...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Verbonden met %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Protocolfout: Berichtnummer %1 werd ontvangen terwijl een updatebericht verwacht werd.</translation>
     </message>
     <message>
diff --git a/i18n/nl/kpacman.ts b/i18n/nl/kpacman.ts
index 2f8d980..dbf6d74 100644
--- a/i18n/nl/kpacman.ts
+++ b/i18n/nl/kpacman.ts
@@ -84,34 +84,24 @@ Dit programma is gebaseerd op de bron van ksnake
 door Michel Filippi (mfilippi@sade.rhein-main.de).
 Het design is sterk beinvloed door Pacman (c)
 1980 MIDWAY MFG.CO.
 
 Ik wil hierbij mijn vriendin Elke Krueers bedanken
 voor de laatste 10 jaar van haar vriendschap.</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="obsolete">Canfiguratiefout</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="obsolete">Er zijn geen schema&apos;s gedefinieerd,
-of er is geen schema geselecteerd.</translation>
-    </message>
-    <message>
         <source>KPacman</source>
         <translation>KPacman</translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Het bitfont kan niet worden geconstrueerd
diff --git a/i18n/nl/launchersettings.ts b/i18n/nl/launchersettings.ts
index 054f89c..802ee89 100644
--- a/i18n/nl/launchersettings.ts
+++ b/i18n/nl/launchersettings.ts
@@ -78,63 +78,44 @@
         <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="obsolete">Laat programma&apos;s in sub-popups zien</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>
@@ -222,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/nl/libaboutapplet.ts b/i18n/nl/libaboutapplet.ts
index 1d77b4b..68f81a4 100644
--- a/i18n/nl/libaboutapplet.ts
+++ b/i18n/nl/libaboutapplet.ts
@@ -2,123 +2,30 @@
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Over.. snelkoppeling</translation>
     </message>
     <message>
         <source>About</source>
         <translation>Over...</translation>
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Over...</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-De &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is geschreven en wordt onderhouden door het Opie Team, een wereldwijd netwerk van softwarebouwers die zich toeleggen op vrije/gratis softwareontwikkeling.
-&lt;/p&gt;
-&lt;p&gt;
-Er is geen centrale groep, bedrijf of instelling die de Opie broncode bezit. Iedereen is welkom om bij te dragen aan Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; voor meer informatie over het Opie project.
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Authors</source>
-        <translation type="obsolete">Schrijvers</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="obsolete">Rapporteer</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Software kan altijd worden verbeterd, en het Opie Team is er klaar voor. Maar jij - de gebruiker - kunt ons vertellen als iets niet werkt zoals verwacht, of beter gedaan kan worden.&lt;/p&gt;
-&lt;p&gt;De Open Palmtop Integrated Environment heeft een foutmanagement systeem. Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; om fouten te melden (in het engels).&lt;/p&gt;
-&lt;p&gt;Als je een verbetering of suggestie hebt willen wij vragen om het foutmanagementsysteem te gebruiken om dit door te geven. Zorg er dan wel voor dat de melding de prioriteit &quot;Feature Wish&quot; geeft.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Join</source>
-        <translation type="obsolete">Meedoen</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Je hoeft geen softwareontwikkelaar te zijn om lid van het Opie Team te zijn. Je kunt meedoen met de nationale teams die programma-interfaces vertalen, je kunt plaatjes thema&apos;s, geluiden of verbeterde documentatie maken, en nog veel meer. Beslis zelf!&lt;/p&gt;
-&lt;p&gt;Ga naar &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; voor informatie over een aantal van de projecten waaraan je mee kunt helpen.&lt;/p&gt;
-&lt;p&gt;Als je meer informatie of documentatie nodig hebt, kan een bezoek aan &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; je voorzien in alles wat je nodig hebt.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-</context>
-<context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation type="unfinished">Over...</translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/nl/libbatteryapplet.ts b/i18n/nl/libbatteryapplet.ts
index 3b5b9ba..b09551d 100644
--- a/i18n/nl/libbatteryapplet.ts
+++ b/i18n/nl/libbatteryapplet.ts
@@ -1,44 +1,32 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Batterijstatus</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Sluit</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Mislukt</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>kan bestand niet openen</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Beide batterijen worden opgeladen</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Opladen</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Beschikbare batterijlading</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Batterijstatus:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Goed</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Laag</translation>
     </message>
     <message>
@@ -57,48 +45,32 @@
         <source>On backup power</source>
         <translation>Reservestroom</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Stroom aangesloten</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Externe stroom niet aangesloten</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Overblijvende batterijtijd</translation>
-    </message>
-    <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Percentage batterij resterend:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Overblijvende batterijtijd:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Geen externe batterij aangesloten</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>geen gegevens</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">Ipaq</translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Hoes</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/nl/libclockapplet.ts b/i18n/nl/libclockapplet.ts
index 3512a56..bd02d12 100644
--- a/i18n/nl/libclockapplet.ts
+++ b/i18n/nl/libclockapplet.ts
@@ -1,26 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherClock</name>
     <message>
-        <source>Information</source>
-        <translation type="obsolete">Informaite</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;De systeemdatum lijkt niet geldig.
-(%1)&lt;/p&gt;&lt;p&gt;Wilt u de klok bijstellen?&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Set time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/libkppp.ts b/i18n/nl/libkppp.ts
index ee26e87..5c4da77 100644
--- a/i18n/nl/libkppp.ts
+++ b/i18n/nl/libkppp.ts
@@ -1,65 +1,45 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountWidget</name>
     <message>
-        <source>&amp;Edit...</source>
-        <translation type="obsolete">&amp;Wijzig...</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected account</source>
         <translation>Geselecteerde verbinding wijzigen</translation>
     </message>
     <message>
-        <source>&amp;New...</source>
-        <translation type="obsolete">&amp;Nieuw...</translation>
-    </message>
-    <message>
         <source>Create a new dialup connection
 to the Internet</source>
         <translation>Maak een nieuwe inbelverbinding
 naar internet</translation>
     </message>
     <message>
-        <source>Co&amp;py</source>
-        <translation type="obsolete">Ko&amp;pieer</translation>
-    </message>
-    <message>
         <source>Makes a copy of the selected account. All
 settings of the selected account are copied
 to a new account, that you can modify to fit your
 needs</source>
         <translation>Maakt een kopie van de geselecteerde verbinding.
 Alle instellingen van de verbinding worden
 gekopieerd naar een nieuwe verbinding, die
 naar wens aan te passen zijn.
 </translation>
     </message>
     <message>
-        <source>De&amp;lete</source>
-        <translation type="obsolete">&amp;Verwijder</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Deletes the selected account
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;p&gt;Verwijdert de geselecteerde
 verbinding
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Pas op!&lt;/b&gt;&lt;/font&gt;</translation>
     </message>
     <message>
-        <source>Maximum number of accounts reached.</source>
-        <translation type="obsolete">Maximumaantal verbindingen bereikt.</translation>
-    </message>
-    <message>
         <source>No account selected.</source>
         <translation>Geen verbinding geselecteerd.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the account &quot;%1&quot;?</source>
         <translation>Weet je zeker dat je deze
 verbinding &quot;%1&quot; wilt verwijderen?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Bevestig</translation>
@@ -111,40 +91,24 @@ verbinding &quot;%1&quot; wilt verwijderen?</translation>
     <message>
         <source>Execute Programs</source>
         <translation>Start programma&apos;s</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>You must enter a unique account name</source>
         <translation>Unieke verbindingsnaam invoeren</translation>
     </message>
-    <message>
-        <source>Byte</source>
-        <translation type="obsolete">Byte</translation>
-    </message>
-    <message>
-        <source>KB</source>
-        <translation type="obsolete">KB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="obsolete">GB</translation>
-    </message>
 </context>
 <context>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
         <translation>Identificatie:</translation>
     </message>
     <message>
         <source>Script-based</source>
         <translation>Script-gebaseerd</translation>
     </message>
     <message>
@@ -355,53 +319,24 @@ some circumstances.</source>
 DNS servers in &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt; tijdelijk
 uitgeschakeld tijdens de verbinding. Zodra de
 verbinding verbroken wordt, worden de servers
 weer ingeschakeld
 
 Over het algemeen is deze optie niet nodig,
 maar hij kan handig zijn.</translation>
     </message>
 </context>
 <context>
     <name>DevicesWidget</name>
     <message>
-        <source>Allows you to modify the selected account</source>
-        <translation type="obsolete">Geselecteerde verbinding wijzigen</translation>
-    </message>
-    <message>
-        <source>Create a new dialup connection
-to the Internet</source>
-        <translation type="obsolete">Maak een nieuwe inbelverbinding
-naar internet</translation>
-    </message>
-    <message>
-        <source>Makes a copy of the selected account. All
-settings of the selected account are copied
-to a new account, that you can modify to fit your
-needs</source>
-        <translation type="obsolete">Maakt een kopie van de geselecteerde verbinding.
-Alle instellingen van de verbinding worden
-gekopieerd naar een nieuwe verbinding, die
-naar wens aan te passen zijn.
-</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Deletes the selected account
-
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Verwijdert de geselecteerde
-verbinding
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Pas op!&lt;/b&gt;&lt;/font&gt;</translation>
-    </message>
-    <message>
         <source>No devices selected.</source>
         <translation>Geen apparaat geselecteerd.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the device &quot;%1&quot;?</source>
         <translation>Deze verbinding echt 
 verwijderen: &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Bevestig</translation>
@@ -414,28 +349,24 @@ verwijderen: &quot;%1&quot;?</translation>
         <source>Edit Device: </source>
         <translation>Wijzig apparaat:</translation>
     </message>
     <message>
         <source>&amp;Device</source>
         <translation>&amp;Apparaat</translation>
     </message>
     <message>
         <source>&amp;Modem</source>
         <translation>&amp;Modem</translation>
     </message>
     <message>
-        <source>You must enter a unique account name</source>
-        <translation type="obsolete">Unieke verbindingsnaam invoeren</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected device</source>
         <translation>Staat toe het geselecteerde apparaat te wijzigen</translation>
     </message>
     <message>
         <source>Create a new device</source>
         <translation>Maak een nieuw apparaat aan</translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
@@ -1004,32 +935,24 @@ het modem</translation>
         <source>Modem failure</source>
         <translation>Modemfalen</translation>
     </message>
     <message>
         <source>A critical failure appeard while testing the modem</source>
         <translation>Een kritieke fout trad op bij modemtest</translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
         <translation>&amp;Verbindingen</translation>
     </message>
     <message>
-        <source>&amp;Device</source>
-        <translation type="obsolete">&amp;Apparaat</translation>
-    </message>
-    <message>
-        <source>&amp;Modem</source>
-        <translation type="obsolete">&amp;Modem</translation>
-    </message>
-    <message>
         <source>&amp;Devices</source>
         <translation>&amp;Apparaten</translation>
     </message>
 </context>
 <context>
     <name>PPPdArguments</name>
     <message>
         <source>Customize pppd Arguments</source>
         <translation>Wijzig pppd functies</translation>
     </message>
     <message>
         <source>Argument:</source>
@@ -1488,31 +1411,24 @@ Vraag de systeembeheerder om dit bestand aan te maken (kan leeg zijn) met de jui
         <translation>&lt;qt&gt;Er is gekozen voor PAP of CHAP authenticatie. Dit vereist dat gebruikersnaam en wachtwoord ingevuld wordt! &lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kan PAP/CHAP authenticatiebestand niet&lt;br&gt;maken: &quot;%1&quot;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>You must specify a telephone number!</source>
         <translation>Er moet een telefoonnummer ingevuld worden!</translation>
     </message>
 </context>
 <context>
-    <name>QObject::ModemWidget</name>
-    <message>
-        <source>Modem timeout:</source>
-        <translation type="obsolete">Modem timeout:</translation>
-    </message>
-</context>
-<context>
     <name>ScriptWidget</name>
     <message>
         <source>Add</source>
         <translation>Toevoegen</translation>
     </message>
     <message>
         <source>Insert</source>
         <translation>Invoegen</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijderen</translation>
diff --git a/i18n/nl/libliquid.ts b/i18n/nl/libliquid.ts
index cbf52e0..8e7c471 100644
--- a/i18n/nl/libliquid.ts
+++ b/i18n/nl/libliquid.ts
@@ -1,75 +1,68 @@
 <!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 type="unfinished">Stijl Vloeibaar</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Geen transparantie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Gestippeld, achtergrondkleur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Gestippeld, knopkleur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Transparant gestippeld, achtergrondkleur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Transparant gestippeld, knopkleur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Eigen transparantie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Menukleur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Tekstkleur</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Opaciteit</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Gebruik geschaduwde menutekst</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Maak gereedschapsbalk vlak</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Gestippeld contrast</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Vloeibaar</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">High Performance Vloeibaar stijl door Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libmemoryapplet.ts b/i18n/nl/libmemoryapplet.ts
index 3a9963d..c30a59a 100644
--- a/i18n/nl/libmemoryapplet.ts
+++ b/i18n/nl/libmemoryapplet.ts
@@ -114,28 +114,24 @@ Gegeugen wordt geklassificeerd als volgt:
         <source>Manage Swapfile</source>
         <translation>Beheer swapfile</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Genereer</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Verwijder</translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="obsolete">2 Mb, 4 Mb, 6 Mb, 8 Mb</translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation>Fout bij ontkoppelen swapfile.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Swapfile uitgeschakeld.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Fout bij maken swapfile.</translation>
     </message>
     <message>
diff --git a/i18n/nl/libopiecore2.ts b/i18n/nl/libopiecore2.ts
index 4930790..355afa7 100644
--- a/i18n/nl/libopiecore2.ts
+++ b/i18n/nl/libopiecore2.ts
@@ -49,28 +49,24 @@
         <source>Upper+Down</source>
         <translation>Hoger+Omlaag</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Hoger+Rechts</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Hoger+Links</translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Geef rotatie weer</translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation>Aktie toets</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>OK toets</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Einde toets</translation>
     </message>
     <message>
diff --git a/i18n/nl/libopieobex.ts b/i18n/nl/libopieobex.ts
index 3891a96..4819008 100644
--- a/i18n/nl/libopieobex.ts
+++ b/i18n/nl/libopieobex.ts
@@ -64,87 +64,13 @@
         <source>Try %1</source>
         <translation>Poging %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation>Zoek nogmaals naar IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation>Start verzending</translation>
     </message>
 </context>
-<context>
-    <name>OtherHandler</name>
-    <message>
-        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Ontvangen:&lt;/b&gt;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="obsolete">Accepteer</translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="obsolete">Weiger</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation type="obsolete">&lt;p&gt;U heeft een file van het type %1 (&lt;img src=&quot;%2&quot;&gt; ontvangen. Wat wilt u ermee doen?</translation>
-    </message>
-</context>
-<context>
-    <name>SendWidget</name>
-    <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Verzenden:&lt;/h1&gt;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="obsolete">Klaar</translation>
-    </message>
-    <message>
-        <source>IrDa is not enabled!</source>
-        <translation type="obsolete">IrDa staat niet aan!</translation>
-    </message>
-    <message>
-        <source>Searching for IrDa Devices.</source>
-        <translation type="obsolete">Zoek naar IrDa apparaten.</translation>
-    </message>
-    <message>
-        <source>Bluetooth is not available</source>
-        <translation type="obsolete">Bluetooth is niet beschikbaar</translation>
-    </message>
-    <message>
-        <source>Searching for bluetooth Devices.</source>
-        <translation type="obsolete">Zoek naar bluetooth apparaten.</translation>
-    </message>
-    <message>
-        <source>Scheduling for beam.</source>
-        <translation type="obsolete">Plan IrDa verzending.</translation>
-    </message>
-    <message>
-        <source>Click to beam</source>
-        <translation type="obsolete">Klick voor IrDa verzending</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <translation type="obsolete">Verzonden</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="obsolete">Mislukt</translation>
-    </message>
-    <message>
-        <source>Try %1</source>
-        <translation type="obsolete">Poging %1</translation>
-    </message>
-    <message>
-        <source>Search again for IrDa.</source>
-        <translation type="obsolete">Zoek nogmaals naar IrDa.</translation>
-    </message>
-    <message>
-        <source>Start sending</source>
-        <translation type="obsolete">Start verzending</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/nl/libopiepim2.ts b/i18n/nl/libopiepim2.ts
index 4f124f4..6c232da 100644
--- a/i18n/nl/libopiepim2.ts
+++ b/i18n/nl/libopiepim2.ts
@@ -1,164 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Kalenderknop</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Contaktenknop</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Menuknop</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Mailknop</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Thuisknop</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Opnameknop</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Beeldschermrotatie</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Lager en omhoog</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Lager en omlaag</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Lager en naar rechts</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Lager en naar links</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Hoger en omhoog</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Hoger en omlaag</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Hoger en naar rechts</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Hoger en naar links</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Kleur:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Verz:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Waarde:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rood:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Groen:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blauw:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Alpha kanaal:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Selecteer kleur</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Meer</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Meer...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Naam:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Naam</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Type</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Groot</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Middel</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Klein</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Terugkerende gebeurtenis</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>Dag</translation>
@@ -357,255 +207,24 @@ and </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>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Terugkerende gebeurtenis</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Geen</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Week</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Maand</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jaar</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Iedere:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequentie</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Beeindig op:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Geen einddatum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Herhaal op</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Wo</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Za</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Zo</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var 1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Geen einddatum</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dagen</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dag</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">weken</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">week</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">maanden</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">maand</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">jaren</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">jaar</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">en</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
- en</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, en</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">op</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Geen herhaling</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dag(en)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Herhaal op</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Wo</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Za</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Zo</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">we(e)k(en)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Herhaal op</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">maand(en)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">ja(a)r(en)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Tijd:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Kies tijd:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -659,68 +278,26 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Bestandsdialoog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Open</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Sla op</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stijl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documenten</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Bestanden</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">Alle bestanden</translation>
-    </message>
-    <message>
         <source>Description:</source>
         <translation>Omschrijving:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioriteit:</translation>
     </message>
     <message>
         <source>Very high</source>
         <translation>Heel hoog</translation>
     </message>
     <message>
@@ -747,56 +324,48 @@ and </source>
         <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 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 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>
diff --git a/i18n/nl/libopieui2.ts b/i18n/nl/libopieui2.ts
index bfeb96f..627151b 100644
--- a/i18n/nl/libopieui2.ts
+++ b/i18n/nl/libopieui2.ts
@@ -1,477 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Kalenderknop</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Contaktenknop</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Menuknop</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Mailknop</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Thuisknop</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Opnameknop</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Beeldschermrotatie</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Lager en omhoog</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Lager en omlaag</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Lager en naar rechts</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Lager en naar links</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Hoger en omhoog</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Hoger en omlaag</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Hoger en naar rechts</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Hoger en naar links</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Kleur:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Verz:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Waarde:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Rood:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Groen:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Blauw:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Alpha kanaal:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Selecteer kleur</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Meer</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Meer...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Bestandsdialoog</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Open</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Sla op</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Naam:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Naam</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Type</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Groot</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Middel</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Klein</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Stijl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyChooserConfigDialog</name>
-    <message>
-        <source>Configure Key</source>
-        <translation type="obsolete">Stel sleutel in</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Pixmap</source>
-        <translation type="obsolete">Pixmap</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Naam</translation>
-    </message>
-    <message>
-        <source>Key</source>
-        <translation type="obsolete">Sleutel</translation>
-    </message>
-    <message>
-        <source>Default Key</source>
-        <translation type="obsolete">Standaardsleutel</translation>
-    </message>
-    <message>
-        <source>Shortcut for Selected Action</source>
-        <translation type="obsolete">Sneltoets voor geselecteerde actie</translation>
-    </message>
-    <message>
-        <source>&amp;None</source>
-        <translation type="obsolete">Gee&amp;n</translation>
-    </message>
-    <message>
-        <source>&amp;Default</source>
-        <translation type="obsolete">Stan&amp;daard</translation>
-    </message>
-    <message>
-        <source>C&amp;ustom</source>
-        <translation type="obsolete">&amp;Aangepast</translation>
-    </message>
-    <message>
-        <source>Configure Key</source>
-        <translation type="obsolete">Stel sleutel in</translation>
-    </message>
-    <message>
-        <source>Default: </source>
-        <translation type="obsolete">Standaard:</translation>
-    </message>
-    <message>
-        <source>Key is on BlackList</source>
-        <translation type="obsolete">Sleutel staat op de zwarte lijst</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;De gekozen sleutel staat op de zwarte lijst en mag niet worden gebruikt, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Key is already assigned</source>
-        <translation type="obsolete">Sleutel is al toegekend</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;De gekozen sleutel is al door een andere functie in gebruik, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Terugkerende gebeurtenis</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Geen</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Week</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Maand</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Jaar</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Iedere:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequentie</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Beeindig op:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Geen einddatum</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Herhaal op</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Wo</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Za</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Zo</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var 1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Geen einddatum</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dagen</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dag</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">weken</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">week</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">maanden</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">maand</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">jaren</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">jaar</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">en</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
- en</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, en</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">op</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Geen herhaling</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dag(en)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Herhaal op</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Ma</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Di</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Wo</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Do</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Vr</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Za</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Zo</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">we(e)k(en)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Herhaal op</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dag</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">maand(en)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">ja(a)r(en)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">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>
@@ -600,293 +137,39 @@ and </source>
         <translation type="unfinished">&lt;qt&gt;De gekozen sleutel staat op de zwarte lijst en mag niet worden gebruikt, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished">Sleutel is al toegekend</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;De gekozen sleutel is al door een andere functie in gebruik, Kies een andere sleutel a.u.b.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Naam</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Grootte</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Mime Type</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>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Prioriteit:</translation>
-    </message>
-    <message>
-        <source>Very high</source>
-        <translation type="obsolete">Heel hoog</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Hoog</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normaal</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Laag</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Heel laag</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Voortgang:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Einddatum:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Kategorie:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Standaard email:</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Bedrijfsadres:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Bedrijf:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Bedrijfswebpagina:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Bedrijfs telefoon:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Bedrijfs fax:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Bedrijfs mobiel:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Bedrijfs pieper:</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <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 type="obsolete">Prive webpagina:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Prive telefoon:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Prive Fax:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Prive mobiel:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Alle Emails:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Beroep:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistent:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Manager:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Man</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Vrouw</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Geslacht:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Wederhelft:</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Verjaardag:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Jaardag:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Kinderen:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Bijnaam:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notities:</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Plaats:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Deze gebeurtenis duurt de hele dag</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Deze gebeurtenis duurt meerdere dagen</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Start:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Eind:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Notities:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 iedere</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">De %1 iedere</translation>
-    </message>
-    <message>
-        <source>The %1 %2 of every</source>
-        <translation type="obsolete">De %1 %2 van iedere</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Maandag</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Dinsdag</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Woensdag</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Donderdag</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Vrijdag</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Zaterdag</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Zondag</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Geen</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">ste</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">de</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">de</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">de</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/nl/libqpe.ts b/i18n/nl/libqpe.ts
index 1237c53..b506bc5 100644
--- a/i18n/nl/libqpe.ts
+++ b/i18n/nl/libqpe.ts
@@ -185,28 +185,24 @@ vwijzigt al categorieen.</translation>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Tekenreeks niet gevonden.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Einde bereikt, begin bovenaan</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation>Einde bereikt, begin bij %1
 
 Datum uit TimeString::shortDate</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Vind</translation>
@@ -450,32 +446,24 @@ before entering data</source>
         <translation>Kan geen startbestanden maken.
 Maak aub plaats voordat u
 data gaat invoeren</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Kan alarm niet instellen.
 Maak ruimte vrij, en probeer het
 nogmaals.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>J</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dag</translation>
     </message>
     <message>
         <source>month</source>
         <translation>maand</translation>
     </message>
     <message>
@@ -510,30 +498,24 @@ nogmaals.</translation>
         <source>Fri</source>
         <translation>Vr</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Za</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Zo</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Weet u zeker dat u %1
-wilt verwijderen?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Alles</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Ongesorteerd</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Werkadres:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -784,44 +766,24 @@ wilt verwijderen?</translation>
         <source>Children</source>
         <translation>Kinderen</translation>
     </message>
     <message>
         <source>Notes</source>
         <translation>Notities</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Groepen</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Klik om dit venster te sluiten zonder 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>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Uitgebreide help voor dit pakket is niet beschikbaar, maar er is wel contextgevoelige hulp.&lt;p&gt;Om de contextgevoelige help te gebruiken:&lt;p&gt;&lt;ol&gt;&lt;li&gt;Druk de help knop enige tijd in.&lt;li&gt;Als op de titelbalk &lt;b&gt;Wat is dit...&lt;/b&gt; staat, druk dan op een functie.&lt;/ol&gt;&lt;/Qt&gt; </translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Wat is dit...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Weet U zeker dat u dit bestand wilt verwijderen
 %1&lt;/qt&gt;</translation>
@@ -866,28 +828,24 @@ wilt verwijderen?</translation>
         <source>Oct</source>
         <translation>okt</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>dec</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Fout</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation>D
 
 Kort voor Dag</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation>M
 
 Kort voor Maand</translation>
@@ -896,53 +854,38 @@ Kort voor Maand</translation>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 document</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></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>Klik om dit venster te sluiten zonder op te slaan.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation>Klik om dit venster te sluiten.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation>Klik om dit venster te sluiten en de veranderingen aktief te maken.</translation>
     </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>Klik om te maximaliseren.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation>Klik om dit venster te kunnen verschuiven.</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Herstel</translation>
     </message>
     <message>
diff --git a/i18n/nl/libtodayaddressbookplugin.ts b/i18n/nl/libtodayaddressbookplugin.ts
index ebe3507..f3bdde9 100644
--- a/i18n/nl/libtodayaddressbookplugin.ts
+++ b/i18n/nl/libtodayaddressbookplugin.ts
@@ -1,44 +1,32 @@
 <!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 type="obsolete">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 type="obsolete">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">Herstart programma om instellingen te activeren!</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>
diff --git a/i18n/nl/libtodaydatebookplugin.ts b/i18n/nl/libtodaydatebookplugin.ts
index 40772f3..a3c5a66 100644
--- a/i18n/nl/libtodaydatebookplugin.ts
+++ b/i18n/nl/libtodaydatebookplugin.ts
@@ -6,83 +6,24 @@
         <translation>[met alarm]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>notitie</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Hele dag</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Laat locatie zien</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Klik hier als iedere afspraak met plaats weergegeven moet worden</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Laat notitie zien</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Klik hier als iedere afspraak met notitie weergegeven moet worden</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Laat alleen latere
-afspraken zien</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Klik hier als alleen afspraken later dan de huidige tijd weergegeven moeten worden</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Hoeveel
-afspraken
-moeten worden
-getoond?</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Hoeveel afspraken moeten maximaal worden weergegeven. Chronologisch</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Hoeveel dagen meer</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Hoeveel dagen meer moeten in de reeks zitten</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">dag(en)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">alleen vandaag</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatumboekPluginConfiguratieBasis</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Laat locatie zien</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Klik hier als iedere afspraak met plaats weergegeven moet worden</translation>
diff --git a/i18n/nl/libtodaytodolistplugin.ts b/i18n/nl/libtodaytodolistplugin.ts
index e06f786..4ba1c76 100644
--- a/i18n/nl/libtodaytodolistplugin.ts
+++ b/i18n/nl/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <source>tasks shown</source>
         <translation>taken weergegeven</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Na hoeveel tekens moet de info over de taak worden afgebroken</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Breek af na X tekens</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">weergegeven taken</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Stel het maximum aantal te tonen taken in</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Breek af na X tekens</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Na hoeveel tekens moet de info over de taak worden afgebroken</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/nl/libtodayweatherplugin.ts b/i18n/nl/libtodayweatherplugin.ts
index c5ccbe0..1067385 100644
--- a/i18n/nl/libtodayweatherplugin.ts
+++ b/i18n/nl/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Luchtdruk:</translation>
         <source>SE </source>
         <translation>ZO</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>KPH</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>MPH</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/libwlan.ts b/i18n/nl/libwlan.ts
index 6042ea0..6068265 100644
--- a/i18n/nl/libwlan.ts
+++ b/i18n/nl/libwlan.ts
@@ -1,309 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">WiFi Configuratie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Algemeen</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation type="obsolete">Mode</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation type="obsolete">ESS-ID</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">Kies &amp;Access Point</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Channel</source>
-        <translation type="obsolete">Specificeer &amp;kanaal</translation>
+        <translation type="unfinished">Algemeen</translation>
     </message>
     <message>
         <source>any</source>
-        <translation type="obsolete">ieder</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="obsolete">Infrastructuur</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="obsolete">Auto</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation type="obsolete">Managed</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation type="obsolete">Ad-Hoc</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation type="obsolete">Versleuteling</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">V&amp;ersleuteling inschakelen</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation type="obsolete">&amp;Sleutelinstelling</translation>
-    </message>
-    <message>
-        <source>Key &amp;1</source>
-        <translation type="obsolete">Sleutel &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation type="obsolete">Sleutel &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="obsolete">Sleutel &amp;3</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation type="obsolete">Sleutel &amp;4</translation>
-    </message>
-    <message>
-        <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Niet-versleutelde pakketten</translation>
-    </message>
-    <message>
-        <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Accepteer</translation>
-    </message>
-    <message>
-        <source>&amp;Reject</source>
-        <translation type="obsolete">Annulee&amp;r</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSID</source>
-        <translation type="obsolete">SSID</translation>
-    </message>
-    <message>
-        <source>Rescan Neighbourhood</source>
-        <translation type="obsolete">Herzoek omgeving</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation type="obsolete">Kan</translation>
+        <translation type="unfinished">SSID</translation>
     </message>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>General</source>
-        <translation type="unfinished">Algemeen</translation>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished">Managed</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished">Ad-Hoc</translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished">Mode</translation>
     </message>
     <message>
-        <source>ESS-ID</source>
-        <translation type="unfinished">ESS-ID</translation>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished">MAC</translation>
     </message>
     <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="unfinished">Kan</translation>
+    </message>
+    <message>
         <source>Encryption</source>
         <translation type="unfinished">Versleuteling</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished">V&amp;ersleuteling inschakelen</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished">&amp;Sleutelinstelling</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished">Sleutel &amp;1</translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished">Sleutel &amp;4</translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished">Sleutel &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished">Sleutel &amp;3</translation>
     </message>
     <message>
-        <source>AP</source>
-        <translation type="unfinished">AP</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation type="unfinished">Snelheid</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished">Kanaal</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation type="unfinished">Station</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished">ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation type="unfinished">Ruis</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished">Kwalitiet</translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation type="unfinished">Signaal</translation>
-    </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished">SSID</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation type="unfinished">Kan</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Link Quality</source>
-        <translation type="unfinished"></translation>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Sleutel &amp;4</translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Verbindingsinformatie</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">Kanaal</translation>
+        <translation type="unfinished">Kanaal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Mode</translation>
+        <translation type="unfinished">Mode</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Station</translation>
+        <translation type="unfinished">Station</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">AP</translation>
+        <translation type="unfinished">AP</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Snelheid</translation>
+        <translation type="unfinished">Snelheid</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Kwalitiet</translation>
+        <translation type="unfinished">Kwalitiet</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Ruis</translation>
+        <translation type="unfinished">Ruis</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Signaal</translation>
+        <translation type="unfinished">Signaal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/mindbreaker.ts b/i18n/nl/mindbreaker.ts
index 182272a..ebe58b4 100644
--- a/i18n/nl/mindbreaker.ts
+++ b/i18n/nl/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>Winstgem: %1 beurten (%2 spellen)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation>Hersenkraker</translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Beurt%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">HuidigeBeurt%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Antwoord%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Schoon Statistieken</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Schoon win ratio?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
diff --git a/i18n/nl/minesweep.ts b/i18n/nl/minesweep.ts
index ca88803..fca520f 100644
--- a/i18n/nl/minesweep.ts
+++ b/i18n/nl/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Gewonnen!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Je bent ontploft!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Mijnenveger</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Beginner</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Gevorderden</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
diff --git a/i18n/nl/opie-console.ts b/i18n/nl/opie-console.ts
index 60e252d..313ace1 100644
--- a/i18n/nl/opie-console.ts
+++ b/i18n/nl/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>Gesynchroniseerd bestand</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Bel nummer: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Mislukking</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Bellen van nummer mislukt.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Afbreken...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Zoeken modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Initialiseren...</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Terminal type</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Kleurschema</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Lettertypegrootte</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">klein</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">middel</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">groot</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Regelovergangsconversies</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Inkomend</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Uitgaand</translation>
     </message>
     <message>
diff --git a/i18n/nl/opie-eye.ts b/i18n/nl/opie-eye.ts
index fd9ac0f..6912152 100644
--- a/i18n/nl/opie-eye.ts
+++ b/i18n/nl/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation>Bekijk als</translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation>Verstuur huidig object</translation>
     </message>
     <message>
@@ -75,47 +87,39 @@
         <source>View Current Item</source>
         <translation>Bekijk huidig object</translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation>Laat beeldinformatie zien</translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation>Verwijder afbeelding</translation>
     </message>
     <message>
-        <source>the Image %1</source>
-        <translation type="obsolete">de afbeelding %1</translation>
-    </message>
-    <message>
         <source>Image</source>
         <translation>Afbeelding</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>the Image</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
-        <translation type="obsolete">Priegel-aanzicht - Instell</translation>
-    </message>
-    <message>
         <source>Browser Keyboard Actions</source>
         <translation>Browser toetsenbord-akties</translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation>Toetsenindeling</translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -205,45 +209,49 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation>%1 - O aanzicht</translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
-        <translation type="obsolete">Opie Eye Caramba</translation>
-    </message>
-    <message>
         <source>Show all files</source>
         <translation>Laat alle bestanden zien</translation>
     </message>
     <message>
-        <source>DirView</source>
-        <translation type="obsolete">Mapaanzicht</translation>
-    </message>
-    <message>
         <source>Opie Eye</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DocView</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -269,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/nl/opie-eye_slave.ts b/i18n/nl/opie-eye_slave.ts
index fe5f14a..ef8c3fe 100644
--- a/i18n/nl/opie-eye_slave.ts
+++ b/i18n/nl/opie-eye_slave.ts
@@ -146,180 +146,24 @@
         <source>Compression: %1
 </source>
         <translation>Compressie: %1
 </translation>
     </message>
     <message>
         <source>InterlaceMode: %1
 </source>
         <translation>Interlacemodus: %1
 </translation>
     </message>
     <message>
-        <source>Colormode: Color
-</source>
-        <translation type="obsolete">Kleurmodus: Kleur
-</translation>
-    </message>
-    <message>
-        <source>Colormode: Black and white
-</source>
-        <translation type="obsolete">Kleurmodus: Zwart/Wit
-</translation>
-    </message>
-    <message>
-        <source>Basic</source>
-        <translation type="obsolete">Grof</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normaal</translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="obsolete">Fijn</translation>
-    </message>
-    <message>
-        <source>Quality: %1
-</source>
-        <translation type="obsolete">Kwaliteit: %1
-</translation>
-    </message>
-    <message>
-        <source>Daylight</source>
-        <translation type="obsolete">Daglicht</translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="obsolete">Fluorescent</translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="obsolete">Tungsten</translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="obsolete">Standaardlicht A</translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="obsolete">Standaardlicht B</translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="obsolete">Standaardlicht C</translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="obsolete">D55</translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="obsolete">D65</translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="obsolete">D75</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="obsolete">Anders</translation>
-    </message>
-    <message>
-        <source>White Balance: %1
-</source>
-        <translation type="obsolete">Witbalans: %1
-</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">Gemiddeld</translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="obsolete">Centreer gewogen gemiddelde</translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="obsolete">Spot</translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="obsolete">MultiSpot</translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="obsolete">Patroon</translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="obsolete">Gedeeltelijk</translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
-</source>
-        <translation type="obsolete">Meetmodus: %1
-</translation>
-    </message>
-    <message>
-        <source>Not defined</source>
-        <translation type="obsolete">Niet opgegeven</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Handmatig</translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="obsolete">Normaal programma</translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="obsolete">Aperture prioriteit</translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="obsolete">Sluiterprioriteit</translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="obsolete">Kreatief programma
-(ingesteld op snelle sluitertijd)</translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="obsolete">Aktief programma
-(ingesteld op snelle sluitertijd)</translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="obsolete">Portretmodus
-(voor close-ups met vervaagde achtergrond)</translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="obsolete">Landschap modus
-(voor landschapfoto&apos;s met scherpe achtergrond)</translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
-</source>
-        <translation type="obsolete">Belichtings programma: %1
-</translation>
-    </message>
-    <message>
         <source>Date/Time: %1
 </source>
         <translation>Datum/Tijd: %1
 </translation>
     </message>
     <message>
         <source>&lt;qt&gt;Comment: %1
 </source>
         <translation>&lt;qt&gt;Commentaar: %1
 </translation>
     </message>
     <message>
diff --git a/i18n/nl/opie-login.ts b/i18n/nl/opie-login.ts
index 37a8ecd..de2604e 100644
--- a/i18n/nl/opie-login.ts
+++ b/i18n/nl/opie-login.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <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 type="obsolete">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>
@@ -40,72 +36,53 @@ accurately to calibrate your screen.</source>
 </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 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="obsolete">&lt;center&gt;Welkom bij OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
-    </message>
 </context>
 <context>
     <name>PasswordDialog</name>
     <message>
         <source>Set Password</source>
         <comment>Caption of the password dialog</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/i18n/nl/opieirc.ts b/i18n/nl/opieirc.ts
index 6e5a007..f476f2a 100644
--- a/i18n/nl/opieirc.ts
+++ b/i18n/nl/opieirc.ts
@@ -64,28 +64,24 @@
         <source>Talking on channel</source>
         <translation>Spreek op kanaal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Kanaaldiscussie</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Type hier je bericht om aan de discussie in het kanaal deel te nemen</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versie</translation>
     </message>
     <message>
@@ -125,116 +121,68 @@
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="obsolete">Ongebruikt nummeriek commando ontvangen:</translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="obsolete">Ongebruikt ctcp commando ontvangen:</translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="obsolete">Ongebruikt tekstueel commando ontvangen:</translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>Niet bestaand kanaal openen - synchronisatie verloren?</translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="obsolete">opent kanaal</translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>Persoon heeft kanaal al geopend - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>U heeft het knaal al geopend - synchronisatie verloren?</translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="obsolete">U verliet het kanaal</translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="obsolete">verliet kanaal</translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>Vertrekken persoon niet gevonden - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>Te verlaten kanaal niet gevonden - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Kanaalbericht van onbekende afzender</translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="obsolete">Kanaalbericht voor onbekend kanaal</translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Onbekende PRIVMSG ontvangen</translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="obsolete">U staat nu bekend als</translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="obsolete">staat nu bekend als</translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Bijnaamverandering van een onbekend persoon</translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="obsolete">is gestopt</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Onbekend persoon is gestopt - synchronisatie verloren?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>veranderde onderwerp in</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Onbekend kanaalonderwerp - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>CTCP PING ontvangen van</translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">CTCP VERSION ontvangen van</translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION met onbekend persoon - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION met onbekend kanaal - synchronisatie verloren?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION met slechte ontvanger</translation>
     </message>
     <message>
@@ -313,32 +261,24 @@
         <source>You left channel %1</source>
         <translation>U verlaat kanaal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 verlaat kanaal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Kanaalbericht voor onbekend kanaal %1</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">U staat nu bekend als %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 staat nu bekend als %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 is weggegaan (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -528,36 +468,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Profielnaam vereist</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Hostnaam vereist</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">Poort vereist</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>Bijnaam vereist</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">Echte naam vereist</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>De kanaallijst moet een komma
 gescheiden lijst met kanaalnamen
 bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -590,28 +522,24 @@ bevatten die beginnen met &apos;#&apos; of &apos;+&apos;</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Verander het geselecteerde serverprofiel</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Voeg een nieuw serverprofiel in</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Verbinding met</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Serverberichten</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Typ commando&apos;s hier in. Een lijst met commando&apos;s kan worden gevonden in OpieIRC help</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/opiemail.ts b/i18n/nl/opiemail.ts
index 3707070..9746085 100644
--- a/i18n/nl/opiemail.ts
+++ b/i18n/nl/opiemail.ts
@@ -238,28 +238,24 @@
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Stel IMAP in</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Gebruiker</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Gebruik SSL</translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Server</translation>
     </message>
     <message>
@@ -328,24 +324,76 @@
     <message>
         <source>Sender</source>
         <translation>Afzender</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Datum</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">Server</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished">Nieuwe map aanmaken</translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -548,28 +596,24 @@ with that filter will be listed.</source>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Stel SMTP in</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Gebruik SSL</translation>
-    </message>
-    <message>
         <source>Use Login</source>
         <translation>Gebruik Login</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Accountnaam</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>SMTP Servernaam</translation>
     </message>
     <message>
@@ -661,34 +705,31 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation>Hoe vaak controleren</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Waarschuwings LED bij nieuwe mail</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Laat geluid horen bij nieuwe mail</translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation>Formulier1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
-        <translation>TekstLabel1</translation>
+        <source>Click activate server/folder</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Laat tekst zien</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Bijlage opslaan</translation>
     </message>
@@ -731,32 +772,36 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Moet deze mail echt worden verwijderd? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished">E-mail met %1</translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
-        <source>E-Mail by %1</source>
-        <translation type="obsolete">E-mail met %1</translation>
-    </message>
-    <message>
         <source>Mail</source>
         <translation>Mail</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Antwoord</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Doorsturen</translation>
     </message>
     <message>
@@ -778,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation>Bestandsnaam</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Grootte</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/nl/opierec.ts b/i18n/nl/opierec.ts
index 6166a67..da8931b 100644
--- a/i18n/nl/opierec.ts
+++ b/i18n/nl/opierec.ts
@@ -28,72 +28,40 @@
         <source>Time</source>
         <translation>Tijd</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Bestanden</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>Sample ratio</translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">44100</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">32000</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">22050</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">16000</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">11025</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">8000</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>Limiteer grootte</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Ongelimiteerd</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Bestandsmap</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Aantal bits</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">16</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">8</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>In</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Uit</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opties</translation>
     </message>
     <message>
@@ -104,58 +72,36 @@
         <source>Low Disk Space</source>
         <translation>Wiening opslagruimte</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>U heeft gebrek aan
 opslagruimte of een
 kaart wordt niet herkend</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">seconden</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Wil je het geselecteerde bestand
-echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Nee</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Kan bestand niet verwijderen.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opieopname</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Kies een bestand om af te spelen</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Notitie</translation>
     </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>
@@ -171,60 +117,36 @@ echt &lt;font size=+2&gt;&lt;B&gt;VERWIJDEREN&lt;/B&gt;&lt;/font&gt;?</translati
         <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 type="obsolete">Opname</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Plaats</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Datum</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Golfvormcompressie (kleinere bestanden)</translation>
     </message>
     <message>
-        <source>auto Mute</source>
-        <translation type="obsolete">auto Stil</translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>Stil</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Stop</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation>Auto Stil</translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="obsolete">Stereokanalen</translation>
-    </message>
-    <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please select file to play</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/nl/osearch.ts b/i18n/nl/osearch.ts
index 6864a13..3818aa8 100644
--- a/i18n/nl/osearch.ts
+++ b/i18n/nl/osearch.ts
@@ -1,52 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>OZoek</translation>
     </message>
     <message>
-        <source>adressbook</source>
-        <translation type="obsolete">adresboek</translation>
-    </message>
-    <message>
-        <source>todo</source>
-        <translation type="obsolete">tedoen</translation>
-    </message>
-    <message>
-        <source>datebook</source>
-        <translation type="obsolete">agenda</translation>
-    </message>
-    <message>
-        <source>applications</source>
-        <translation type="obsolete">programma&apos;s</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="obsolete">documenten</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Zoek</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Zoek alles</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">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>
@@ -111,52 +87,36 @@
         <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 type="obsolete">laat afgemaakte taken zien</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">laat vroegere gebeurtenissen zien</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">zoek in data</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Bestand:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Link:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>MIMEtype:</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">zoek inhoud</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>zoek naar %1</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>
diff --git a/i18n/nl/oxygen.ts b/i18n/nl/oxygen.ts
index 8ad1498..416bfaa 100644
--- a/i18n/nl/oxygen.ts
+++ b/i18n/nl/oxygen.ts
@@ -64,40 +64,28 @@
         <source>Group</source>
         <translation>Groep</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Elektronegativiteit</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Atoomradius</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Ionisatieenergie</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Dichtheid</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Kookpunt</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Smeltpunt</translation>
-    </message>
-    <message>
         <source>Ionization Energy</source>
         <translation>Ionisatie-energie</translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation>Kookpunt</translation>
     </message>
     <message>
         <source>Melting point</source>
         <translation>Smeltpunt</translation>
     </message>
 </context>
diff --git a/i18n/nl/patience.ts b/i18n/nl/patience.ts
index c843b74..4495cc5 100644
--- a/i18n/nl/patience.ts
+++ b/i18n/nl/patience.ts
@@ -17,68 +17,44 @@
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Spel</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Verander achterkant kaarten</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Klem naar positie</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Instellingen</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Over</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Speel</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Verander achterkant kaarten</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Klem naar positie</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Draai een kaart</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Draai drie kaarten</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation>&amp;Verander kaartillustratie</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>&amp;Spring naar plaats</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>Verander kaartillustratie</translation>
     </message>
     <message>
diff --git a/i18n/nl/qpe.ts b/i18n/nl/qpe.ts
index 16c88be..e183f38 100644
--- a/i18n/nl/qpe.ts
+++ b/i18n/nl/qpe.ts
@@ -57,98 +57,31 @@
         <translation>Fout</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Kon programma %1 niet vinden.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">Programma probleem</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 reageert niet.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Wilt u het programma geforceerd verlaten?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Raak de richtkruizen duidelijk en
 precies aan om het scherm in te stellen.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Welkom bij Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">Documenten</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">Icoonaanzicht</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">Lijstaanzicht</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Batterijlading is kritiek!
-Laat uitgeschakeld tot kan worden opgeladen!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">Batterijlading is erg laag.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">De reservebatterijlading is erg laag.
-Reservebatterij opladen aub.</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">visitekaartje</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">Informatie</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;De systeemdatum lijkt niet correct.
-(%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Batterijstatus</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Batterij bija leeg</translation>
     </message>
 </context>
@@ -166,54 +99,42 @@ Reservebatterij opladen aub.</translation>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Tik ergens op het scherm om door te gaan.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Wachten aub, inladen van %1 instellingen.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Wachten aub...</translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation type="obsolete">FirstUseBackground</translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation>Beeindig</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
         <translation>Launcher</translation>
     </message>
     <message>
-        <source>Finding documents</source>
-        <translation type="obsolete">Vinden documenten</translation>
-    </message>
-    <message>
-        <source>Searching documents</source>
-        <translation type="obsolete">Zoeken documenten</translation>
-    </message>
-    <message>
         <source> - Launcher</source>
         <translation>- Launcher</translation>
     </message>
     <message>
         <source>No application</source>
         <translation>Geen programma</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;Er is geen programma ingesteld voor dit document.&lt;p&gt;Type is %1.</translation>
     </message>
     <message>
@@ -242,107 +163,44 @@ Reservebatterij opladen aub.</translation>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation>&lt;b&gt;Bestanden opzoeken...&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation>&lt;b&gt;Het Documenten Tabblad&lt;p&gt;is uitgeschakeld.&lt;p&gt;Gebruik Instellingen-&gt;Launcher-&gt;DocTab&lt;p&gt;om het weer aan te schakelen.&lt;/b&gt;&lt;/center&gt;</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>Documentaanzicht</translation>
     </message>
     <message>
         <source>All types</source>
         <translation>Alle types</translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation>Nieuw opslagmedium ontdekt:</translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation>Wat moet ik er mee doen?</translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">Ingeschakeld medium</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">Een &lt;b&gt;opslagmedium&lt;/b&gt; is ingeschakeld. Moet dit onderzocht worden op mediabestanden?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Welke mediabestanden</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">Plaatjes</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Tekst</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">Video</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">Koppel programma&apos;s</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Beperk zoeken tot map: (nog niet gebruikt)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Voeg toe</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">Uw beslissing word opgeslagen op het medium.</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">Vraag niet nogmaals voor dit medium</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation>Stel dit medium in. De veranderingen gaan in bij het afsluiten van het programma. Om het Document Tabblad te vernieuwen moet het medium verwijderd en opnoeiw ingevoerd worden.</translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation>Welke mediabestanden</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation>Audio</translation>
@@ -376,31 +234,24 @@ Reservebatterij opladen aub.</translation>
         <translation>Verwijder</translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation>Doorzoek heel medium</translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation>Contoleer dit medium altijd</translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">Batterijstatus</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation>Veilige modus</translation>
     </message>
@@ -428,36 +279,24 @@ Reservebatterij opladen aub.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>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>&lt;p&gt;De systeemdatum lijkt niet correct.
 (%1)&lt;/p&gt;&lt;p&gt;Wilt u deze corrigeren?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Batterijlading is kritiek!
-Laat uitgeschakeld tot kan worden opgeladen!</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">De reservebatterijlading is erg laag.
-Reservebatterij opladen aub.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation>visitekaartje</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Veilige 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;Een fout is opgetreden bij de systeemopstart, en het systeem is nu in Veilige Modus. Plugins worden niet geladen in Velige Modus. De Plugin Manager kan worden gebruikt om de foute plugins uit te schakelen.</translation>
     </message>
     <message>
@@ -525,77 +364,55 @@ direct afsluiten.</translation>
         <source>Reboot</source>
         <translation>Herstarten</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Opie herstarten</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>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="obsolete">&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>Annuleren</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Synchronisatieverbinding</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">Een niet geautoriseerd systeem probeert toegang te krijgen tot dit apparaat.&lt;p&gt;Aub upgraden als u een versie van Qtopia desktop ouder dan 1.5.1 gebruikt.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation>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>&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>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>&lt;p&gt;Een ongeauthoriseerd systeem vraagt om toegang tot dit apparaat.&lt;p&gt;Als u een versie van Qtopia Desktop ouder dan 1.5.1 gebruikt, kunt u het best upgraden, anders de veiligheidsinstellingen wijzigen naar IntelliSync.</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;p&gt;Een ongeauthoriseerd systeem vraagt om toegang tot dit apparaat.&lt;p&gt;Instellingen staan op IntelliSync, dus ik kan deze verbinding weigeren of toelaten.&lt;/qt&gt;</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>Afbreken</translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation>Synchroniseren:</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/security.ts b/i18n/nl/security.ts
index 7ed60e0..36eb5e4 100644
--- a/i18n/nl/security.ts
+++ b/i18n/nl/security.ts
@@ -66,60 +66,28 @@ Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
         <source>Login</source>
         <translation type="unfinished">Log in</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sync</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished">Attentie</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Annuleer</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">Iedere</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Geen</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -194,286 +162,24 @@ Alleen een geconfigureerd gebruiker kan geselecteerd worden.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Annuleer</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Stel PINcode in</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Verander PINcode</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Voer PINcode in</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">PINcode niet correct</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Ingevoerde PINcode is niet correct.
-Toegang geweigerd</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Geen</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Voer nieuwe PINcode in</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Voer nieuwe opnieuw PINcode in</translation>
-    </message>
-    <message>
-        <source>Attention</source>
-        <translation type="obsolete">Attentie</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Alle gebruikersinstellingen zullen verloren gaan.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Annuleer</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Beveiligingsinstellingen</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Verander PINcode</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Schoon PINcode</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Vraag PINcode bij power-aan</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Sync</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Accepteer sync van netwerk:</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (standaard)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Iedere</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Geen</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;p&gt;PINcode beveiliging biedt slechts een minimale beveiliging tegen toevallige toegang tot dit apparaat.</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">PINcode</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Log in</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">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="obsolete">Met deze toets kan het bebeiligingswachtwoord gewijzigd worden.
-
-Let op: Dit is *niet* het synchronisatiewachtwoord.</translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="obsolete">Verwijder huidig wachtwoord.
-Een nieuwe kan altijd worden ingevoerd.</translation>
-    </message>
-    <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation type="obsolete">Als deze optie gebruikt wordt, moet iedere keer dat dit apparaat ingeschakeld wordt een wachtwoord ingevoerd worden.</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="obsolete">Als deze optie gebruikt wordt, zal opie-login automagisch voor u inloggen als de gebruiker die geselecteerd is in de lijst hieronder.
-
-Voor de Zaurus 5x00 is dit altijd &quot;root&quot;.</translation>
-    </message>
-    <message>
-        <source>This drop-down list allows you to select the user for auto-login
-(if enabled above).  
-
-You can only select an actually configured user.</source>
-        <translation type="obsolete">Op deze lijst  kunt u de gebruiker voor auto-login selecteren
-(als deze optie aanstaat)
-
-Alleen een geconfigureerd gebruiker kan geselecteerd worden.</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="obsolete">Selecteer een net-bereik of vul een nieuwe in.
-
-Met deze lijst kan een net-bereik gekozen worden waarmee de handheld tegestaan is te verbinden.
-
-Bijvoorbeeld, als een net-bereik ingesteld wordt als 192.168.1.0/24 kan iedere machine met een IP adres tussen 192.168.1.1 en 192.168.1.254 verbinden (en synchroniseren)met deze handheld.
-
-De instelling &quot;Iedere&quot; zal *alle* IP adressen toelaten,
-De instelling &quot;Geen&quot; zal alle IP adressen *weigeren*.
-
-Bij twifel tijdelijk &quot;Iedere&quot; gebruiken.</translation>
-    </message>
-    <message>
-        <source>Delete Entry</source>
-        <translation type="obsolete">Verwijder invoer</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="obsolete">Verwijder het net-bereik uit de lijst
-
-Als deze knop gebruikt wordt, wordt het huidige net-bereik gewist uit de lijst met net-bereiken.
-
-Als deze knop per ongeluk gebruikt wordt, kunnen de standaardinstellingen
-worden teruggezet met de knop &quot;Herstel standaardinstelling&quot;.</translation>
-    </message>
-    <message>
-        <source>Restore Defaults</source>
-        <translation type="obsolete">Herstel standaardinstelling</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="obsolete">Deze knop zal de lijst met net-bereiken terugbrengen
-naar zijn standaardinstelling.
-
-Let erop dat daarmee al uw ingevulde net-bereiken zullen worden gewist!</translation>
-    </message>
-    <message>
-        <source>Select your sync software</source>
-        <translation type="obsolete">Kies de synchronisatiesoftware</translation>
-    </message>
-    <message>
-        <source>IntelliSync</source>
-        <translation type="obsolete">IntelliSync</translation>
-    </message>
-    <message>
-        <source>Qtopia 1.7</source>
-        <translation type="obsolete">Qtopia 1.7</translation>
-    </message>
-    <message>
-        <source>Opie 1.0</source>
-        <translation type="obsolete">Opie 1.0</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sync</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Accepteer sync van netwerk:</translation>
diff --git a/i18n/nl/snake.ts b/i18n/nl/snake.ts
index b71e549..9bf42e9 100644
--- a/i18n/nl/snake.ts
+++ b/i18n/nl/snake.ts
@@ -13,39 +13,31 @@
         <source>SNAKE!</source>
         <translation>SNAKE!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Gebruik de richtingtoetsen om de
 slang de muizen te laten opeten. U moet
 de muren, randen en de staart ontwijken.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Druk een toets om te starten</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>Score: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER!
 Uw score: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Druk een toets om opnieuw te starten.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Druk een toets om te beginnen</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Druk een toets om een nieuw spel te beginnen.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/nl/sysinfo.ts b/i18n/nl/sysinfo.ts
index c4fba82..b476485 100644
--- a/i18n/nl/sysinfo.ts
+++ b/i18n/nl/sysinfo.ts
@@ -49,28 +49,24 @@
         <source>&amp;Start Tests!</source>
         <translation>&amp;Start Tests!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Klik hier om de geselecteerde tests uit te voeren.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Kies een model om de resultaten mee te vergelijken.</translation>
     </message>
     <message>
-        <source>Compare To:</source>
-        <translation type="obsolete">Vergelijk met:</translation>
-    </message>
-    <message>
         <source>error</source>
         <translation>fout</translation>
     </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
@@ -126,40 +122,24 @@
     <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 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>
@@ -197,66 +177,52 @@ Gehugen wordt als volgt onderverdeeld:
         <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>
-    </message>
-    <message>
         <source>Used by</source>
         <translation>Gebruikt door</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">Wilt u %1 echt gebruiken op dit onderdeel?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Moet %1 echt
 gebruikt worden op deze module?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
@@ -303,34 +269,24 @@ Druk een tijd op een module om meer informatie over de module te zien, of een si
         <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 type="obsolete">Wilt u %1 echt naar dit onderdeel sturen?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Moet %1 echt naar
 dit proces gestuurd worden?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Systeeminfo</translation>
     </message>
@@ -381,32 +337,24 @@ dit proces gestuurd worden?</translation>
         <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 type="obsolete">&lt;p&gt;Model:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>&lt;br&gt;Model:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Merk:</translation>
     </message>
     <message>
diff --git a/i18n/nl/systemtime.ts b/i18n/nl/systemtime.ts
index 2b5b9ae..c0b91d5 100644
--- a/i18n/nl/systemtime.ts
+++ b/i18n/nl/systemtime.ts
@@ -60,36 +60,24 @@
         <source>Format</source>
         <translation>Formaat</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
         <source>Predict</source>
         <translation>Voorspel</translation>
     </message>
     <message>
-        <source>You asked for a delay of </source>
-        <translation type="obsolete">U vroeg om een vertraging van</translation>
-    </message>
-    <message>
-        <source> minutes, but only </source>
-        <translation type="obsolete">minuten, maar slechts</translation>
-    </message>
-    <message>
-        <source> minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
-        <translation type="obsolete">minuten zijn verstreken sinds laatste controle.&lt;br&gt;Doorgaan?</translation>
-    </message>
-    <message>
         <source>Continue?</source>
         <translation>Doorgaan?</translation>
     </message>
     <message>
         <source>Running:
 ntpdate </source>
         <translation>Voer uit:
 ntpdate</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Fout</translation>
@@ -104,28 +92,24 @@ ntpdate</translation>
     </message>
     <message>
         <source>Time Server</source>
         <translation>Tijdsserver</translation>
     </message>
     <message>
         <source>Error while getting time from
  server: </source>
         <translation>Fout tijdens ophalen tijd van
 server:</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">seconden</translation>
-    </message>
-    <message>
         <source>Could not connect to server </source>
         <translation>Kan niet met server verbinden</translation>
     </message>
     <message>
         <source>You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.&lt;br&gt;Continue?</source>
         <translation>U vroeg om een vertraging van %1 minuten, maar slechts %2 minuten zijn verstreken sinds de laatste controle. &lt;br&gt; Doorgaan?</translation>
     </message>
     <message>
         <source>%1 seconds</source>
         <translation>%1 seconden</translation>
     </message>
     <message>
diff --git a/i18n/nl/tableviewer.ts b/i18n/nl/tableviewer.ts
index 32cbd05..8d965e1 100644
--- a/i18n/nl/tableviewer.ts
+++ b/i18n/nl/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Kan standaardwaarde niet instellen bij type %1, Key niet toegevoegd.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Geen juist type gevonden</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Reset</translation>
     </message>
     <message>
         <source>key</source>
         <translation>sleutel</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/nl/textedit.ts b/i18n/nl/textedit.ts
index 6548380..ef6d2e9 100644
--- a/i18n/nl/textedit.ts
+++ b/i18n/nl/textedit.ts
@@ -145,30 +145,24 @@
         <source>Unnamed</source>
         <translation>Onbenoemd</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>Rechten</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>Kies lettertype</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">Wil je het huidige&lt;BR&gt;bestand echt&lt;B&gt;verwijderen&lt;/B&gt;van de schijf?
-&lt;BR&gt;Dit is &lt;B&gt;onomkeerbaar!!&lt;/B&gt;</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nee</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>Tekst Editor is een copyright van &lt;BR&gt;2000 Trolltech AS, en&lt;BR&gt;2002 door &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;en is gelicenseerd onder de GPL</translation>
     </message>
     <message>
diff --git a/i18n/nl/tictac.ts b/i18n/nl/tictac.ts
index 87aace0..38c68f3 100644
--- a/i18n/nl/tictac.ts
+++ b/i18n/nl/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/nl/today.ts b/i18n/nl/today.ts
index 15d8850..346f6d9 100644
--- a/i18n/nl/today.ts
+++ b/i18n/nl/today.ts
@@ -9,36 +9,28 @@
         <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 type="obsolete">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>
-    <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
@@ -71,72 +63,24 @@
         <source>Move Up</source>
         <translation>Schuif omhoog</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Schuif omlaag</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>aktief/volgorde</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">autostart bij
-opstarten?
-(alleen Opie)</translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">vink dit aan als Vandaag moet starten vanuit slaapstand.</translation>
-    </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Kleine bovenbalk</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">minuten inactief</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Hoeveel minuten moet de PDA uitstaan voor Vandaag automatisch opkomt bij herstart</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Icoongrootte</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Stel icoongrootte in pixel in</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Ververs</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Hoevaak moet Vandaag zich verversen</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">sec</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">nooit</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Div</translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Formulier1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
diff --git a/i18n/nl/todolist.ts b/i18n/nl/todolist.ts
index a9ecb68..680755b 100644
--- a/i18n/nl/todolist.ts
+++ b/i18n/nl/todolist.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="obsolete">&lt;h1&gt;Alarm om %0&lt;/h1&gt;&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>&lt;h1&gt;Alarm om %1&lt;/h1&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Onbenoemd</translation>
     </message>
 </context>
@@ -80,206 +76,118 @@
     <message>
         <source>Edit Task</source>
         <translation>Wijzig taak</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>stil</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>luid</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie TeDoen lijst</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Nieuw van voorbeeld</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nieuwe taak</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Klik hier om een nieuwe taak te maken.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Wijzig taak</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Klik hier om de huidige taak te wijzigen.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Bekijk taak</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Verwijder...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Klik hier om de huidige taak te verwijderen.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Verwijder alle...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Verwijder gedaan</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Dupliceer</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">IrDa Versturen</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Klik hier om de huidige taak naar een ander apparaat te sturen.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Vind</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Laat gedane taken zien</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Laat alleen taken over tijd zien</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Laat taak-eindtijden zien</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Laat snelle taakbalk zien</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opties</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>SnelWijziging</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Dit is een lijst van alle huidige taken.
 
 De lijst geeft de volgende info door:
 1. Gedaan - Een groen vinkje geeft aan dat de taak is afgemaakt. Klik hier om een taak af te maken.
 2. Prioriteit - Een grafische weergave vaan de taakprioriteit. Dubbelklik om te wijzigen.
 3. Omschrijving - Omschrijving van de taak. Klik hier om de taak te selecteren.
 4. Streefdatum - Laat streefdatum voor taak zien. Deze kolom kan worden verborgen/weergegeven door Opties-&gt;&apos;Laat taak streefdata zien&apos; uit het menu hierboven te kiezen.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Alle kategorieen</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Onbenoemd</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Plaatsgebrek</translation>
     </message>
     <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 type="obsolete">Omschrijving</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Einddatum</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
@@ -507,28 +415,24 @@ Deze staat u toe om snel een nieuwe taak aan de lijst toe te voegen. Dit vlak ka
         <source>Select category to organize this task with.</source>
         <translation>Selekteer kategorie waar deze taak inhoort.</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>Terugkerende taak</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>Klik hier als deze taak vaker voorkomt. Indien geselecteerd, kan frequentie ingesteld worden op de terugkerings tab.</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notities:</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>Voer hier extra info over deze taak in.</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>Te Doen Lijst</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>Overzicht:</translation>
     </message>
 </context>
diff --git a/i18n/nl/usermanager.ts b/i18n/nl/usermanager.ts
index fde84a1..a62d688 100644
--- a/i18n/nl/usermanager.ts
+++ b/i18n/nl/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>Groep toevoegen</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Groep wijzigen</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE Gebruikersmanager</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Opie Gebruikersmanager</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Gebruiker toevoegen</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/nl/zsafe.ts b/i18n/nl/zsafe.ts
index 9f29023..ecc8911 100644
--- a/i18n/nl/zsafe.ts
+++ b/i18n/nl/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategorie</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Icoon</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Veld 1</translation>
@@ -419,35 +208,24 @@ laat de lijst van mappen en bestanden zien</translation>
     <message>
         <source>Please Wait...</source>
         <translation>een moment aub...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kan de map
-%1
-niet maken.
-
-ZSafe zal nu afsluiten.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Opslaan</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Opslaan met nieuw &amp;Wachtwoord</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Exporteer tekstbestand</translation>
     </message>
     <message>
@@ -510,36 +288,24 @@ ZSafe zal nu afsluiten.</translation>
         <source>&amp;About</source>
         <translation>&amp;Over</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Naam</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Veld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Veld 3</translation>
     </message>
     <message>
@@ -554,40 +320,32 @@ ZSafe zal nu afsluiten.</translation>
         <source>Field 5</source>
         <translation>Veld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Echt verwijderen?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Niet verwijderen</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Invoer wijzigen</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Nieuwe Invoer</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>De naam van de invoer moet
 zich van de categorienaam
 onderscheiden.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Zoek</translation>
     </message>
     <message>
         <source>Entry not found</source>
@@ -698,88 +456,40 @@ opslaan</translation>
         <source>Category</source>
         <translation>Categorie</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>een moment aub...</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Zoek naar Symbolen...</translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Handheld Wachtwoord Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">door Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Vertaling door Ruben Lubbes&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Nieuw document</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Open document</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>Bestand &amp;opslaan als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Maak nieuw ZSafe Bestand</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation>Open ZSafe Bestand</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">ZSafe document opslaan als..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kan de map
-.../Documents/application
-niet maken.
-
-ZSafe zal nu afsluiten.
-</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kan de map
-.../Documents/application/zsafe
-niet maken.
-
-ZSafe zal nu afsluiten.
-</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation>Nieuwe Invoer</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Wijzig categorie of record</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Verwijder categorie of record</translation>
     </message>
     <message>
@@ -826,32 +536,24 @@ before continuing?</source>
         <translation>
 voor u verdergaat?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>U moet tweemaal een wacht-
 woord invoeren voor
 uw nieuwe bestand.</translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe versie 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe versie 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/advancedfm.ts b/i18n/no/advancedfm.ts
index 767e66a..4cd8e21 100644
--- a/i18n/no/advancedfm.ts
+++ b/i18n/no/advancedfm.ts
@@ -1,34 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>Merk</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Den katalogen eksisterer ikke</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-er opphavsrettslig beskyttet 2002-2003
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-og er GPL lisensiert</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>Vis skjulte filer</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>Bytt katalog</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Utfør</translation>
     </message>
     <message>
@@ -131,95 +117,48 @@ og er GPL lisensiert</translation>
         <source>Date</source>
         <translation>Dato</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Sikker på at du vil slette
-filene %1 ?</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Ja</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nei</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>Slette katalog?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Sikker på at du vil kopiere
-filene %1?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Filen eksisterer!</translation>
     </message>
     <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 eksisterer. Ok for å overskrive?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Kunne ikke kopiere %1 til %2</translation>
-    </message>
-    <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">Eksisterer. Ok for å overskrive?</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Kunne ikke kopiere</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">til</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation type="unfinished">Kopier</translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished">Som</translation>
     </message>
     <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">Eksisterer allerede.
-Er du sikker på at du vil slette?</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Kunne ikke flyttes
-</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>AvansertFm utskrift</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>AvansertFm Beam ut</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Ir sent.</translation>
     </message>
     <message>
diff --git a/i18n/no/appearance.ts b/i18n/no/appearance.ts
index 0703b97..739c30f 100644
--- a/i18n/no/appearance.ts
+++ b/i18n/no/appearance.ts
@@ -61,64 +61,24 @@ Klikk her for å velge et tilgjengelig fargesystem.</translation>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Klikk her for å slette valgte fargesystem i listen til venstre.</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Lagre</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Klikk her å gi det nåværende fargesystemet et navn og lagre den.</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Påfør stilen på alle applikasjoner.</translation>
-    </message>
-    <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Klikk her for å tillate alle applikasjoner å bruke globale visningsinnstillinger.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Slå av stil for disse applikasjoner (&lt;b&gt;*&lt;/b&gt; kan bli brukt som wildcard):</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Om noen applikasjoner ikke vises korrekt med globale visningsinnstillinger, kan visse funksjoner skues av for disse applikasjonene.
-
-Dette området tillater deg å velge en applikasjon og hvilke innstillinger du vil slå av.</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binær fil(er)</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Klikk her for å legge til en applikasjon på listen ovenfor.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Klikk her for å slette den nåværende valgte applikasjon.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Klikk her for å flytte den nåværende valgte applikasjon opp på listen.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Klikk her for å flytte den nåværende valgte applikasjon ned på listen.</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Fane stil:</translation>
     </message>
     <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Klikk her for å velge ønsket stil for fanebaserte dialoger (som denne applikasjonen). Tilgjengelige stiler er:
 
@@ -183,64 +143,44 @@ Dette området tillater deg å velge en applikasjon og hvilke innstillinger du v
         <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 type="obsolete">Omstart</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Vil du starte om %1 nå?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Ja</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&lt;ny&gt;</translation>
-    </message>
-    <message>
         <source>Show Scrollbars on the left</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to display scrollbars on the left side instead of the right.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>EditScheme</name>
     <message>
         <source>Edit scheme</source>
diff --git a/i18n/no/aqpkg.ts b/i18n/no/aqpkg.ts
index c20c284..32d7bca 100644
--- a/i18n/no/aqpkg.ts
+++ b/i18n/no/aqpkg.ts
@@ -471,42 +471,34 @@ er IKKE anbefalt!</translation>
         <translation>Ønsker du å slette eller reinstallere
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Slette eller reinstallere</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Reinstallere</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">R</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Ønsker du å slette eller oppgradere
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Slette eller oppgradere</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">U</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Oppdaterer Launcher...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Beskrivelse&lt;/b&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/no/clock.ts b/i18n/no/clock.ts
index 3e17cf1..e79f1c3 100644
--- a/i18n/no/clock.ts
+++ b/i18n/no/clock.ts
@@ -31,72 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Blunde</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Klokke</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Stoppeklokke</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Nullstill</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Still inn alarm</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Sett dato og tid.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarm PÅ</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarm AV</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Stopp</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Klokke: Alarm ble oversett.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -230,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Still inn alarm</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Time</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minutter</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 alarm</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Utsett
-(minutter)</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Alle</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Lyd</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/no/datebook.ts b/i18n/no/datebook.ts
index a52f561..2f315ae 100644
--- a/i18n/no/datebook.ts
+++ b/i18n/no/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/no/libliquid.ts b/i18n/no/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/no/libliquid.ts
+++ b/i18n/no/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/no/libwlan.ts b/i18n/no/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/no/libwlan.ts
+++ b/i18n/no/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/no/opie-eye.ts b/i18n/no/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/no/opie-eye.ts
+++ b/i18n/no/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/no/opiemail.ts b/i18n/no/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/no/opiemail.ts
+++ b/i18n/no/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/no/zsafe.ts b/i18n/no/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/no/zsafe.ts
+++ b/i18n/no/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/pl/addressbook.ts b/i18n/pl/addressbook.ts
index 233f161..419b35d 100644
--- a/i18n/pl/addressbook.ts
+++ b/i18n/pl/addressbook.ts
@@ -19,136 +19,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Nieprzydzielone</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Kontakty</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Kontakt</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nowy</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Edytuj</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Usuń</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Znajdź</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Napisz e-mail do</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Emituj wpis</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Moje dane osobiste</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Widok</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Nie można zmieniać danych podczas synchronizacji</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Edycja moich danych osobistych</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Edycja adresu</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Kontakty - moje dane osobiste</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Brak miejsca w pamięci</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Nie można zapisać informacji.
 Zwolnij miejsce w pamięci
 i spróbuj ponownie
 
 Zakończyć?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Nieprzydzielone</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importuj wizytówkę (vCard)</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Zamknij eyszukiwarkę</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Zapisz wszystkie dane</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Konfiguruj</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Nie znaleziono</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Wizytówki</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Wizytówka</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Szukaj</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Właściwy typ pliku?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Tak</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Nie</translation>
     </message>
     <message>
@@ -170,28 +94,24 @@ Czy na pewno chcesz go otworzyć?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Czy na pewno chcesz dodać wizytówkę
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Tak na &amp;wszystkie</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Eksportuj wizytówkę (vCard)</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Musisz wybrać wizytówkę!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Musisz podać nazwę pliku!</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1385,180 +1305,13 @@ dostępny za darmo!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Eksportuj wizytówkę (vCard)</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Moje dane osobiste</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Firma - telefon</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Firma - fax</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Sluzbowa komorka</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Domyslny e-mail</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Adresy e-mail</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Telefon domowy</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Dom - fax</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Prywatna komorka</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Biuro</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Zawod</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Asystent</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Kierownik</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Wspolmalzonek</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Plec</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Urodziny</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Rocznica</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Przydomek</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Dzieci</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Tytul</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Imie</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Drugie imie</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Nazwisko</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Tytul</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Pokazuj jako</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Stanowisko</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Wydzial</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Firma</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Firma - ulica</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Firma - miasto</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Firma - region</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Firma - kod pocztowy</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Firma - kraj</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Firma - pager</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Firma - strona WWW</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Dom - ulica</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Dom - miasto</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Dom - region</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Dom - kod pocztowy</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Dom - kraj</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Strona domowa</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notatki</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pl/advancedfm.ts b/i18n/pl/advancedfm.ts
index c357742..d17303f 100644
--- a/i18n/pl/advancedfm.ts
+++ b/i18n/pl/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Notatka</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Nie mozna zmienic nazwy</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Folder nie istnieje</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Kopiuj jako</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Wyjscie AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Emisja AdvancedFm</translation>
     </message>
     <message>
@@ -137,138 +133,60 @@
         <source>Copy </source>
         <translation>Kopiuj</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Jako</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiuj ten sam folder</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Nie mozna skopiowac
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">do</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Nie mozna przeniesc</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Dodaj do Dokumentow</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Akcje</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Zaznacz wszystko</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Czy na pewno usunac 
-%1 plikow?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Usunac folder?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Czy na pewno skopiowac
-%1 plikow?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Plik istnieje!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-istnieje. Czy nadpisac?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">juz istnieje.
-Czy na pewno chcesz go usunac?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 istnieje. Czy nadpisac?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Nie mozna skopiowac %1 do %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Zaawansowany Menedzer Plikow
-prawa autorskie 2002-2003
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-na licencji GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Dodaj folder do zakladek</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Usun aktualny folder z zakladek</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Blad</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">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 type="obsolete">Czy na pewno usunac %1
-wraz z zawartoscia?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">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>
diff --git a/i18n/pl/appearance.ts b/i18n/pl/appearance.ts
index 98e02e3..dcdfb63 100644
--- a/i18n/pl/appearance.ts
+++ b/i18n/pl/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Edytuj...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Zapisz</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Wymuszaj styl dla wszystkich aplikacji.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Wyłącz styl dla aplikacji (można używać znaku specjalnego &lt;b&gt;*&lt;/b&gt;):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Plik(i) binarny(e)</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Styl zakładek:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Zakładki</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Zakładki z ikonami</translation>
     </message>
     <message>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Restart</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Czy chcesz teraz zrestartowac %1?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Tak</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Nie</translation>
-    </message>
-    <message>
         <source>Save Scheme</source>
         <translation>Zapisz szablon</translation>
     </message>
     <message>
         <source>Save scheme</source>
         <translation>Zapisz szablon</translation>
     </message>
     <message>
         <source>Scheme does already exist.</source>
         <translation>Szablon już istnieje.</translation>
     </message>
     <message>
         <source>Delete scheme</source>
         <translation>Usuń szablon</translation>
     </message>
     <message>
         <source>Unable to delete current scheme.</source>
         <translation>Nie można usunąć aktualnego szablonu.</translation>
     </message>
     <message>
-        <source>&lt;new&gt;</source>
-        <translation type="obsolete">&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 określają wygląd elementów takich jak przyciski i listwy przewijania w aplikacjach.
 
 Kliknij tu aby wybrać dostępny 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 skonfigurować wybrany styl.
@@ -161,52 +129,24 @@ Kliknij tu aby wybrać dostępny schemat.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Kliknij tu aby zmienić kolory w aktualnym szablonie barw.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Kliknij tu aby usunąć szablon barw wybrany na liście po lewej stronie.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Kliknij tu aby nazwać i zapisać aktualny szablon barw.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Kliknij tu aby zezwolić wszystkim aplikacjom na używanie globalnych ustawień wyglądu.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Jeśli niektóre aplikacje nie wyświetlają się prawidłowo z globalnymi ustawieniami wyglądu, pewne funkcje mogą być dla nich  wyłączone.
-
-Ten obszar pozwala ci na wybór aplikacji i opcji, ktore chcesz wyłączyć.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Kliknij tu aby dodać aplikację do powyższej listy.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Kliknij tu aby usunąć aktualnie wybraną aplikację.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Kliknij to aby przesunąć wybraną aplikację w górę listy.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Kliknij to aby przesunąć wybraną aplikację w dół listy.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Kliknij tu aby wybrać styl dla okien dialogowych z zakładkami (takich jak ta aplikacja). Dostępne style to:
 
 1. Zakładki - normalne zakładki jedynie z tekstem
 2. Zakładki z ikonami - zakładki z ikonami, etykieta tekstowa pojawia się jedynie na aktualnej zakładce
 3. Lista rozwijana - pionowa lista zakładek
 4. Lista rozwijana z ikonami - pionowa lista zakładek z ikonami</translation>
diff --git a/i18n/pl/aqpkg.ts b/i18n/pl/aqpkg.ts
index c1ee840..c3a3333 100644
--- a/i18n/pl/aqpkg.ts
+++ b/i18n/pl/aqpkg.ts
@@ -197,56 +197,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Nie mozna otworzyc pliku statusu - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Nie mozna utworzyc tymczasowego pliku statusu - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Nie mozna rozpoczac procesu ipkg</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Nie mozna otworzyc: </translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Tworzenie katalogu</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">%1 zlinkowany do %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Nie udalo sie zlinkowanie %1 do %2</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Usuniete %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Nie udalo sie usuniecie %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Usuniete</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Nie udalo sie usunac</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pl/backup.ts b/i18n/pl/backup.ts
index a568a8c..25ede1b 100644
--- a/i18n/pl/backup.ts
+++ b/i18n/pl/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Archiwizacja i odzyskiwanie... pracuje...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Archiwizacja i odzyskiwanie</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Błąd z systemu:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Wiadomość</translation>
@@ -27,44 +23,36 @@
         <source>Ok</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Szczegóły</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Archiwizacja i odzyskiwanie... Porażka!!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Tworzenie kopii udalo sie.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Wybierz coś do odzyskania.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Odzyskanie nie powiodło się.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Nie można otworzyć pliku: %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Odzyskiwanie udalo sie.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation>Archiwizacja powiodła się.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Odzyskanie powiodło się.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -98,52 +86,44 @@
         <source>Backup And Restore</source>
         <translation>Archiwizacja i odzyskiwanie</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Archiwizacja</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplikacje</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Zapisz do</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Archiwizuj</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Odzyskiwanie</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Wybierz źródło</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Kolumna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Odzyskuj</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Aktualizuj listę plików</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/calculator.ts b/i18n/pl/calculator.ts
index 9ec7564..c281e7d 100644
--- a/i18n/pl/calculator.ts
+++ b/i18n/pl/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Eksperymantalny kalkulator</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Kalkulator</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <translation type="obsolete">Kalkulator</translation>
-    </message>
-    <message>
         <source>Standard</source>
         <translation>Standardowy</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Standardowy</translation>
     </message>
     <message>
         <source>Weight</source>
diff --git a/i18n/pl/calibrate.ts b/i18n/pl/calibrate.ts
index 6ff3d60..8fbeb0d 100644
--- a/i18n/pl/calibrate.ts
+++ b/i18n/pl/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Dotknij mocno i dokladnie krzyzyka
 zeby skalibrowac ekran.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Witamy w Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pl/checkbook.ts b/i18n/pl/checkbook.ts
index 6b55825..6ff7092 100644
--- a/i18n/pl/checkbook.ts
+++ b/i18n/pl/checkbook.ts
@@ -29,48 +29,24 @@
         <source>Enter name of checkbook here.</source>
         <translation>Wpisz nazwę 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 type="obsolete">Oszczednosci</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Czeki</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Rynek finansowy</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Wspolny fundusz</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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 nazwę banku dla rachunku.</translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation>Numer konta:</translation>
     </message>
     <message>
@@ -93,32 +69,24 @@
         <source>Enter the initial balance for this checkbook here.</source>
         <translation>Wpisz tu początkowy 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 type="obsolete">Aktualny bilans: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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 przesortować wpisy wg pewnego pola, kliknij na nazwę kolumny.</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Data</translation>
     </message>
     <message>
@@ -173,28 +141,24 @@ By przesortować wpisy wg pewnego pola, kliknij na nazwę kolumny.</translation>
         <source>Deposits by category</source>
         <translation>Wpłaty 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 rysować wybrany wykres.</translation>
     </message>
     <message>
-        <source>Current balance: %1%2</source>
-        <translation type="obsolete">Aktualny bilans: %1%2</translation>
-    </message>
-    <message>
         <source>Delete transaction</source>
         <translation>Usuń transakcję</translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation>Ochrona hasłem</translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation>Kliknij tu aby włączyć/wyłączyć ochronę tego rachunku hasłem.</translation>
     </message>
     <message>
@@ -646,109 +610,37 @@ The value entered should always be positive.</source>
 
 Wpisana wartość powinna być liczbą dodatnią.</translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation>Notatki:</translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation>Wpisz tu wszelkie dodatkowe informacje o transakcji.</translation>
     </message>
     <message>
-        <source>Automobile</source>
-        <translation type="obsolete">Samochod</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Rachunki</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">Plyty CD</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Ubrania</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Komputer</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">Plyty DVD</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Elektronika</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Rozrywka</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Jedzenie</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Bezyna</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Rozne</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Filmy</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Czynsz</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="obsolete">Podroz</translation>
-    </message>
-    <message>
         <source>Debit Charge</source>
         <translation>Karta płatnicza</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 type="obsolete">Praca</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Czlonek rodziny</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">Rozne</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>Płatność automatyczna</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotówka</translation>
     </message>
-    <message>
-        <source>Electronics</source>
-        <translation type="obsolete">Elektronika</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pl/clock.ts b/i18n/pl/clock.ts
index ecaa716..b75da64 100644
--- a/i18n/pl/clock.ts
+++ b/i18n/pl/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Drzemka</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Zegar</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Stoper</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Uruchom</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Zeruj</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Ustaw alarm</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarm jest włączony</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarm jest wyłączony</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Zatrzymaj</translation>
     </message>
     <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Ustaw datę i godzinę.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Zegar: Alarm został przeoczony.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarm ustawiony: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -234,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Ustaw alarm</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Godzina</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuta</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Opóźnienie drzemki
-(minuty)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">alarm mp3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Wszystkie</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pl/datebook.ts b/i18n/pl/datebook.ts
index 64fd139..4142b6e 100644
--- a/i18n/pl/datebook.ts
+++ b/i18n/pl/datebook.ts
@@ -333,24 +333,32 @@ Wyjść?</translation>
     <message>
         <source>Office</source>
         <translation>Biuro</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategoria:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DateBookWeek</name>
     <message>
         <source>This is an all day event.</source>
         <translation>To jest zdarzenie całodobowe.</translation>
     </message>
 </context>
 <context>
     <name>DateBookWeekHeader</name>
     <message>
         <source>w</source>
@@ -406,59 +414,24 @@ Wyjść?</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>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">So</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Ni</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Kalendarz</translation>
     </message>
     <message>
         <source>Repeat...</source>
         <translation>Powtarzaj...</translation>
     </message>
     <message>
@@ -571,28 +544,24 @@ Wyjść?</translation>
     <message>
         <source>Description </source>
         <translation>Opis</translation>
     </message>
     <message>
         <source>Start - End </source>
         <translation>Od - do</translation>
     </message>
     <message>
         <source>Note...</source>
         <translation>Notatki...</translation>
     </message>
-    <message>
-        <source>Start Time</source>
-        <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>
diff --git a/i18n/pl/doctab.ts b/i18n/pl/doctab.ts
index c8ba325..ea14d81 100644
--- a/i18n/pl/doctab.ts
+++ b/i18n/pl/doctab.ts
@@ -1,30 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettingsBase</name>
     <message>
         <source>DocTab Settings</source>
         <translation>Ustawienia Dokumentów</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="obsolete">&lt;b&gt;Czy chcesz używać zakładki Dokumenty?&lt;/b&gt;&lt;p&gt;
-(Zakładka ta skanuje &lt;i&gt;wszystkie&lt;/i&gt; dokumenty
-na &lt;i&gt;wszystkich&lt;/i&gt; nośnikach, co może być całkiem
-powolne i denerwujące...)</translation>
-    </message>
-    <message>
         <source>Enable the DocTab</source>
         <translation>Włącz Dokumenty</translation>
     </message>
     <message>
         <source>Yes, please!</source>
         <translation>Tak, proszę!</translation>
     </message>
     <message>
         <source>No, thanks.</source>
         <translation>Nie, dziękuję.</translation>
     </message>
     <message>
diff --git a/i18n/pl/embeddedkonsole.ts b/i18n/pl/embeddedkonsole.ts
index 06204dd..c6412bd 100644
--- a/i18n/pl/embeddedkonsole.ts
+++ b/i18n/pl/embeddedkonsole.ts
@@ -1,110 +1,62 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>Wybór polecenia</translation>
     </message>
-    <message>
-        <source>new</source>
-        <translation type="obsolete">nowe</translation>
-    </message>
-    <message>
-        <source>edit</source>
-        <translation type="obsolete">edytuj</translation>
-    </message>
-    <message>
-        <source>delete</source>
-        <translation type="obsolete">usun</translation>
-    </message>
-    <message>
-        <source>up</source>
-        <translation type="obsolete">gora</translation>
-    </message>
-    <message>
-        <source>down</source>
-        <translation type="obsolete">dol</translation>
-    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>Polecenia</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Polecenia&lt;/B&gt;:</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Sugerowane polecenia&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Bardzo małe</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Małe</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Średnie</translation>
-    </message>
-    <message>
         <source>Show command list</source>
         <translation>Wyświetl listę poleceń</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Ukryj listę poleceń</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Zakładki na dole</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Zielone na czarnym</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Czarne na białym</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Białe na czarnym</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Czarne na przeźroczystym</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Czarne na czerwonym</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Czerwone na czarnym</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Zielone na żółtym</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Niebieskie na magneta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magneta na niebieskim</translation>
     </message>
     <message>
@@ -119,32 +71,24 @@
         <source>Blue on Black</source>
         <translation>Niebieskie na czarnym</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Bursztyn na czarnym</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Kolory</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Czcionka</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opcje</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Nowy</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Wprowadź</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Spacja</translation>
     </message>
     <message>
@@ -159,28 +103,24 @@
         <source>Down</source>
         <translation>Dół</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Wklej</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Szybka edycja</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Edycja</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Brak</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Lewo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Prawo</translation>
     </message>
     <message>
@@ -203,28 +143,24 @@
         <source>Command List</source>
         <translation>Lista poleceń</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Zawijaj</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Używaj sygnału</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Zakładki na górze</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/fifteen.ts b/i18n/pl/fifteen.ts
index 9923c69..7d3ff91 100644
--- a/i18n/pl/fifteen.ts
+++ b/i18n/pl/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Losuj</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Poukladaj</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Gra</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Pietnascie</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/formatter.ts b/i18n/pl/formatter.ts
index dcd5cae..e829e28 100644
--- a/i18n/pl/formatter.ts
+++ b/i18n/pl/formatter.ts
@@ -13,76 +13,50 @@
         <source>File Systems</source>
         <translation>Systemy plikow</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Glowny</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">UWAGA:
-Zmiana parametrow na tej
-stronie moze zaklocic prawidlowe
-dzialanie twojego systemu!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Edytuj fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Sprawdz dysk</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Urzadzenie</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Punkt montowania</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Formatowac?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Na pewno formatowac
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-na</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">system plikow?!?
-Stracisz wszystkie dane!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Tak</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Nie</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Nie mozna zformatowac.
 Nieznany typ</translation>
@@ -118,50 +92,36 @@ Device is busy!</source>
     </message>
     <message>
         <source>No such device!</source>
         <translation>Brak takiego urzadzenia!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 zostal zformatowany.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Probuje zamontowac.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Zamontowanie karty nie powiodlo sie!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-zostal zamontowany.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Mozesz zamknac okno z wynikami.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Wewnetrzny</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Typ pamieci:</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Calosc: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Zajete: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/pl/go.ts b/i18n/pl/go.ts
index 8cf56ce..f45b56b 100644
--- a/i18n/pl/go.ts
+++ b/i18n/pl/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Remis.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Pasuje</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Wiezniowie: czarni %1, biali %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Go</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pl/keypebble.ts b/i18n/pl/keypebble.ts
index 0695994..55a7e61 100644
--- a/i18n/pl/keypebble.ts
+++ b/i18n/pl/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>Blad odczytu: QSocket zglosil blad przy czytaniu
 danych, prawdopodobnie zdalny host porzucil
 polaczenie.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket zglosil nieprawidlowy kod bledu</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Oczekiwanie na inicjalizacje serwera...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Oczekiwanie na nazwe pulpitu...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Polaczony do %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Blad protokolu: Id Wiadomosci %1 znalezione zamiast oczekiwanej wiadomosci o aktualizacji.</translation>
     </message>
     <message>
diff --git a/i18n/pl/launchersettings.ts b/i18n/pl/launchersettings.ts
index 31a2246..40dc5c4 100644
--- a/i18n/pl/launchersettings.ts
+++ b/i18n/pl/launchersettings.ts
@@ -78,28 +78,24 @@
         <source>Show Launcher tabs in O-Menu</source>
         <translation>W O-menu pokazuj zakładki Launcher&apos;a</translation>
     </message>
     <message>
         <source>Check the applets that you want to have included in the O-Menu.</source>
         <translation>Zaznacz applety, które mają być umieszczone w O-menu.</translation>
     </message>
     <message>
         <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
         <translation>Dodaje zawartość zakładek Launcher&apos;a jako menu w O-menu.</translation>
     </message>
     <message>
-        <source>Show Applications in subpopups</source>
-        <translation type="obsolete">Pokazuj aplikacje w podokienkach</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>Przykład 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
@@ -207,52 +203,44 @@
         <source>Edit</source>
         <translation>Edytuj</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Usuń</translation>
     </message>
     <message>
         <source>Enable big busy indicator</source>
         <translation>Włącz duży wskaźnik zajętości</translation>
     </message>
     <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="obsolete">Wlacz migajacy wskaznik zajetosci</translation>
-    </message>
-    <message>
         <source>Select the Launcher Tab you want to edit or delete.</source>
         <translation>Wybierz zakładkę, którą chcesz edytować lub usunąć.</translation>
     </message>
     <message>
         <source>Adds a new Tab to the Launcher.</source>
         <translation>Dodaje nową zakładkę do Launcher&apos;a.</translation>
     </message>
     <message>
         <source>Opens a new dialog to customize the select Tab.</source>
         <translation>Otwiera okno z ustawieniami wybranej zakładki.</translation>
     </message>
     <message>
         <source>Deletes a Tab from the Launcher.</source>
         <translation>Usuwa zakładkę.</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, jeśli chcesz wyświetlać duży wskaźnik zajętości na środku ekranu zamiast tego w pasku zadań.</translation>
     </message>
     <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="obsolete">Wybierz to, jasli chcesz aby ikonki uruchamianych aplikacji migaly przy starcie.</translation>
-    </message>
-    <message>
         <source>All Tabs</source>
         <translation>Wszystkie zakładki</translation>
     </message>
     <message>
         <source>Documents</source>
         <translation>Dokumenty</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
     <message>
diff --git a/i18n/pl/libbatteryapplet.ts b/i18n/pl/libbatteryapplet.ts
index 88d0993..0211115 100644
--- a/i18n/pl/libbatteryapplet.ts
+++ b/i18n/pl/libbatteryapplet.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
         <source>Charging</source>
         <translation>Ładowanie</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Pozostały procent energii</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Stan baterii:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Dobry</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Niski</translation>
     </message>
     <message>
@@ -37,68 +33,44 @@
         <source>On backup power</source>
         <translation>Na zasilaniu zapasowym</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Podłączony do zasilania</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Zewnętrzne zasilanie odłączone</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Pozostały czas działania baterii</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Zamknij</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Stan baterii</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Porażka</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>nie można otworzyć pliku</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Ładowanie obu urządzeń</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Pozostały procent energii:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Pozostały czas działania baterii:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Wkład z baterią nie jest włożony</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>brak danych</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">Ipaq</translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Wkład</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/libliquid.ts b/i18n/pl/libliquid.ts
index e3fdee5..0a2fe89 100644
--- a/i18n/pl/libliquid.ts
+++ b/i18n/pl/libliquid.ts
@@ -1,75 +1,68 @@
 <!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 type="unfinished">Styl Liquid</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Bez przezroczystosci</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Pasiasty, kolor tla</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Pasiasty, kolor przycisku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Przezroczysty pasiasty, kolor tla</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Przezroczysty pasiasty, kolor przycisku</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Ustawiona przezroczystosc</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Kolor menu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Kolor tekstu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Nieprzezroczystosc</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Uzywaj cieniowanego tekstu menu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Plaskie przyciski na pasku narzedzi</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Kontrast pasków</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Bardzo wydajny styl Liquid autorstwa Mosfet&apos;a</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libopiepim2.ts b/i18n/pl/libopiepim2.ts
index 0b7bd1f..bca6e80 100644
--- a/i18n/pl/libopiepim2.ts
+++ b/i18n/pl/libopiepim2.ts
@@ -1,164 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Przycisk Kalendarz</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Przycisk Kontakty</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Przycisk Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Przycisk Poczta</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Przycisk Dom</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Przycisk Zapis</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Obrót ekranu</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Dolny+Góra</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Dolny+Dół</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Dolny+Prawo</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Dolny+Lewo</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Górny+Góra</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Górny+Dół</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Górny+Prawo</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Górny+Lewo</translation>
-    </message>
-    <message>
-        <source>Action Button</source>
-        <translation type="obsolete">Przycisk Akcji</translation>
-    </message>
-    <message>
-        <source>OK Button</source>
-        <translation type="obsolete">Przycisk OK</translation>
-    </message>
-    <message>
-        <source>End Button</source>
-        <translation type="obsolete">Przycisk Koniec</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Czerwień:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Zieleń:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Błękit:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Kanał alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Wybierz kolor</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Więcej</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Wiecej...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nazwa:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nazwa</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Typ Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Duże</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Średnie</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Małe</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Zdarzenie powtarzalne</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Brak</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dzień</translation>
@@ -357,243 +207,24 @@ i</translation>
         <translation type="unfinished">mesiąc(e)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">rok (lata)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Co</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Zdarzenie powtarzalne</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Brak</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dzień</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Tydzień</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Miesiąc</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Rok</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Co:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Częstotliwość</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Koniec:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Bez daty końcowej</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Powtarzaj używając</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Wto</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Śro</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Czw</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pią</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Nie</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Co</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Bez daty końcowej</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dni</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dzień</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">tygodni</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">tydzień</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">miesięcy</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">miesiąc</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">lat</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">rok</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">i</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-i</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, i</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Bez powtarzania</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dzień (dni)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Powtarzaj używając</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Wto</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Śro</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Czw</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pią</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Nie</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">tydzień(dnie)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Powtarzaj co</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dzień</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mesiąc(e)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">rok (lata)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Co</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">używając</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Czas:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Wybierz czas:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -647,50 +278,24 @@ i</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Plik</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Otwórz</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Zapisz</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Styl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Postęp:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Koniec:</translation>
@@ -843,36 +448,24 @@ i</translation>
         <source>Friday</source>
         <translation>Piątek</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Sobota</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Niedziela</translation>
     </message>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Dokumenty</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Pliki</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -887,32 +480,24 @@ i</translation>
         <source>Location:</source>
         <translation>Lokacja:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Zdarzenie całodobowe</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 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 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 każdego</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Opis:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Adres służbowy:&lt;/b&gt;</translation>
     </message>
     <message>
diff --git a/i18n/pl/libopieui2.ts b/i18n/pl/libopieui2.ts
index 4c01222..161e8f9 100644
--- a/i18n/pl/libopieui2.ts
+++ b/i18n/pl/libopieui2.ts
@@ -1,402 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Przycisk Kalendarz</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Przycisk Kontakty</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Przycisk Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Przycisk Poczta</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Przycisk Dom</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Przycisk Zapis</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Obrót ekranu</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Dolny+Góra</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Dolny+Dół</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Dolny+Prawo</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Dolny+Lewo</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Górny+Góra</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Górny+Dół</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Górny+Prawo</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Górny+Lewo</translation>
-    </message>
-    <message>
-        <source>Action Button</source>
-        <translation type="obsolete">Przycisk Akcji</translation>
-    </message>
-    <message>
-        <source>OK Button</source>
-        <translation type="obsolete">Przycisk OK</translation>
-    </message>
-    <message>
-        <source>End Button</source>
-        <translation type="obsolete">Przycisk Koniec</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Czerwień:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Zieleń:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Błękit:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Kanał alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Wybierz kolor</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Więcej</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Wiecej...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">Plik</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Otwórz</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Zapisz</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nazwa:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nazwa</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Typ Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Duże</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Średnie</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Małe</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Styl</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Nazwa</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Zdarzenie powtarzalne</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Brak</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dzień</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Tydzień</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Miesiąc</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Rok</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Co:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Częstotliwość</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Koniec:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Bez daty końcowej</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Powtarzaj używając</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Wto</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Śro</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Czw</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pią</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Nie</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Co</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Bez daty końcowej</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dni</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dzień</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">tygodni</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">tydzień</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">miesięcy</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">miesiąc</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">lat</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">rok</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">i</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-i</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, i</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Bez powtarzania</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dzień (dni)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Powtarzaj używając</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Wto</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Śro</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Czw</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pią</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Nie</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">tydzień(dnie)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Powtarzaj co</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dzień</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mesiąc(e)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">rok (lata)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Co</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">używając</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>
@@ -525,453 +137,38 @@ i</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nazwa</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Rozmiar</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Typ Mime</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Priorytet:</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Postęp:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Koniec:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Kategoria:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">Domyślny e-mail:</translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Biuro:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">WWW firma:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Tel. firma:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Fax firma:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Tel. kom. firma:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Pager firma:</translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Strona domowa:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Tel. dom:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Fax dom:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Tel. kom. dom:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Adresy e-mail:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Zawód:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Asystent:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Menadżer:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Mężczyzna</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Kobieta</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Płeć:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Partner:</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Urodziny:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Rocznica:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Dzieci:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Przydomek:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notatki:</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Początek:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Koniec:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Notatka:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Co</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 każdego</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">%1 każdego</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Co</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Poniedziałek</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Wtorek</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Środa</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Czwartek</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Piątek</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Sobota</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">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 type="obsolete">Bardzo wysoki</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Wysoki</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normalny</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Niski</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Bardzo niski</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Lokacja:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Zdarzenie całodobowe</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Zdarzenie wielodniowe</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <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 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 type="obsolete">%1 %2 każdego</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">Opis:</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adres służbowy:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;b&gt;Adres domowy:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>User Id</source>
-        <translation type="obsolete">ID użytkownika</translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Tytuł</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Imię</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Drugie imię</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Nazwisko</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Przyrostek</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Zapisz jako</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Tytuł służbowy</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Dział</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Firma</translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Tel. firma</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax firma</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Tel. kom. firma</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Domyślny e-mail</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Adresy e-mail</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Tel. dom</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax dom</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Tel. kom. dom</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Ulica firma</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Miasto firma</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Region firma</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Kod poczt. firma</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Kraj firma</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Pager firma</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">WWW firma</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Biuro</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Zawód</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Asystent</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Menadżer</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Ulica dom</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Miasto dom</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Region dom</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Kod poczt. dom</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Kraj dom</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Strona domowa</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Partner</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Płeć</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Urodziny</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Rocznica</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Przydomek</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Dzieci</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notatki</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Brak</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pl/libqpe.ts b/i18n/pl/libqpe.ts
index ad82d3f..05d0239 100644
--- a/i18n/pl/libqpe.ts
+++ b/i18n/pl/libqpe.ts
@@ -185,28 +185,24 @@ edytuje kategorie.</translation>
     <message>
         <source>Find</source>
         <translation>Znajdź</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Tekst nie został znaleziony.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Osiągnąłem koniec, zaczynam od początku</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation>Osiągnięto koniec, zaczynam od %1</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Znajdź</translation>
     </message>
     <message>
@@ -443,62 +439,48 @@ Please free up some space
 before entering data</source>
         <translation>Nie można utworzyć plików startowych
 Zrób więcej miejsca w pamięci
 przed wprowadzeniem danych</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Nie można ustawić alarmu
 Zwolnij więcej pamięci i spróbuj ponownie.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>R</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dzień</translation>
     </message>
     <message>
         <source>month</source>
         <translation>miesiąc</translation>
     </message>
     <message>
         <source>year</source>
         <translation>rok</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Jestes pewnien ze chces zusunac
- %1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Wszystkie</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Nieprzydzielony</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Adres służbowy:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -781,44 +763,24 @@ Zwolnij więcej pamięci i spróbuj ponownie.</translation>
         <source>Fri</source>
         <translation>Pią</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Nie</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Kliknij aby zamknąć to okno porzucając zmiany.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Kliknij aby zamknąć to okno.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Kliknij aby zamknąć to okno akceptując zmiany.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Kliknij aby zmienić okno w przesuwane.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Kliknij aby rozszerzyć okno na całą dostępną przestrzeń.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Ot&gt;Wyczerpująca pomoc dla tej aplikcji jest niedostępna, ale jest pomoc kontekstowa.&lt;p&gt;Aby jej użyć:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknij i przytrzymaj przycisk pomocy.&lt;li&gt;gdy tytuł okna zmieni się na &lt;b&gt;Co to jest...&lt;/b&gt;, kliknij na dowolny element.&lt;/ol&gt;&lt;/Ot&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Co to jest...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Czy na pewno chcesz usunąć
 %1?&lt;/qt&gt;</translation>
@@ -863,28 +825,24 @@ Zwolnij więcej pamięci i spróbuj ponownie.</translation>
         <source>Oct</source>
         <translation>Paź</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Lis</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Gru</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Blad</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation>D</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation>M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/pl/libtodayaddressbookplugin.ts b/i18n/pl/libtodayaddressbookplugin.ts
index 2505e2c..4f342c2 100644
--- a/i18n/pl/libtodayaddressbookplugin.ts
+++ b/i18n/pl/libtodayaddressbookplugin.ts
@@ -1,32 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AddressBookPluginConfig</name>
     <message>
         <source>Max Lines: </source>
         <translation>Maksymalnie linii:</translation>
     </message>
     <message>
         <source>Set the maximum number of lines that should be shown for each anniversaries/birthdays</source>
         <translation>Ustaw maksymalną liczbę linii, jaka ma być wyświetlana dla urodzin/rocznic</translation>
     </message>
     <message>
-        <source>Clip line after X chars: </source>
-        <translation type="obsolete">Ogranicz linię do X znaków:</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Po ilu znakach powinna być obcięta informacja o zadaniu</translation>
-    </message>
-    <message>
         <source>Days look ahead: </source>
         <translation>Ile dni naprzód:</translation>
     </message>
     <message>
         <source>How many days we should search forward</source>
         <translation>Ile dni w przód wyświetlać</translation>
     </message>
     <message>
         <source>Set Headline Color: </source>
         <translation>Ustaw kolor nagłówka:</translation>
     </message>
     <message>
@@ -51,28 +43,24 @@ jeśli bliżej niż</translation>
         <source> days: </source>
         <translation>dni:</translation>
     </message>
     <message>
         <source>This urgent color will be used if we are close to the event !</source>
         <translation>Ten kolor będzie użyty jeśli zdarzenie jest bliskie!</translation>
     </message>
     <message>
         <source>The urgent color will be used if the birthday/anniversary is closer than given days !</source>
         <translation>Ten kolor będzie użyty jeśli urodziny/rocznica są bliższe niż podana liczba dni!</translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">By uaktywnić ustawienia: Uruchom ponownie aplikację!</translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation>Włącz/Wyłącz widoki</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Pokazuj &amp;urodziny</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>Pokazuj &amp;rocznice</translation>
     </message>
     <message>
diff --git a/i18n/pl/libtodayweatherplugin.ts b/i18n/pl/libtodayweatherplugin.ts
index b39d7cd..b2f9221 100644
--- a/i18n/pl/libtodayweatherplugin.ts
+++ b/i18n/pl/libtodayweatherplugin.ts
@@ -96,25 +96,21 @@ Pres: </source>
         <source>SE </source>
         <translation>SE</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>KPH</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>MPH</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/libwlan.ts b/i18n/pl/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/pl/libwlan.ts
+++ b/i18n/pl/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/pl/mindbreaker.ts b/i18n/pl/mindbreaker.ts
index 2c81f7b..03ad6d7 100644
--- a/i18n/pl/mindbreaker.ts
+++ b/i18n/pl/mindbreaker.ts
@@ -8,28 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>Wygrane sr: %1 tur (%2 gier)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Odpowiedz%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Kasuj statystyki</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Kasowac proporcje wygranych?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
diff --git a/i18n/pl/minesweep.ts b/i18n/pl/minesweep.ts
index c3a8065..46362ad 100644
--- a/i18n/pl/minesweep.ts
+++ b/i18n/pl/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Wygrales!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Ekspodowales!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Saper</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Poczatkujacy</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Zaawansowany</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Ekspert</translation>
     </message>
     <message>
diff --git a/i18n/pl/opie-console.ts b/i18n/pl/opie-console.ts
index ae0a37e..cd412e7 100644
--- a/i18n/pl/opie-console.ts
+++ b/i18n/pl/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>PlikZsynchronizowany</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Wybieranie numeru: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Porazka</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Wybieranie numeru nie powiodlo sie.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Anulowanie...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Szukanie modemu</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Inicjalizacja...</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Typ terminalu</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Schemat kolorow</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Rozmiar czcionki</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">mala</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">srednia</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">wielka</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Konwersje lamania linii</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/opie-eye.ts b/i18n/pl/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/pl/opie-eye.ts
+++ b/i18n/pl/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/opie-login.ts b/i18n/pl/opie-login.ts
index c8f641f..6dce7e5 100644
--- a/i18n/pl/opie-login.ts
+++ b/i18n/pl/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Dotykaj krzyzykow mocno i dokladnie
 aby skalibrowac ekran.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">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>
@@ -41,28 +37,24 @@ aby skalibrowac ekran.</translation>
 </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 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>
diff --git a/i18n/pl/opiemail.ts b/i18n/pl/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/pl/opiemail.ts
+++ b/i18n/pl/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/pl/osearch.ts b/i18n/pl/osearch.ts
index 2047b02..7fd0ce7 100644
--- a/i18n/pl/osearch.ts
+++ b/i18n/pl/osearch.ts
@@ -5,28 +5,24 @@
         <source>OSearch</source>
         <translation>OSearch</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Szukaj wszędzie</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">Wielkość liter znacząca</translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation>Używaj znaków specjalnych</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Szczegóły aktualnych wyników</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
@@ -91,52 +87,36 @@
         <source>execute</source>
         <translation>wykonaj</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>otwórz w menedżerze plików</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>otwórz przy pomocy</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation type="obsolete">pokazuj ukończone zadania</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">pokazuj przeszłe wydarzenia</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">szukaj w datach</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Plik:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Link:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Typ MIME:</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">przeszukuj zawartość</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>wyszukuję %1</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>
diff --git a/i18n/pl/patience.ts b/i18n/pl/patience.ts
index d59567b..8ae4075 100644
--- a/i18n/pl/patience.ts
+++ b/i18n/pl/patience.ts
@@ -5,68 +5,44 @@
         <source>Patience</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Gra</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Zmien Rewers Kart</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Skocz do pozycji&gt;</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Graj</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Zmien Rewers Kart</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Skocz do pozycji</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Obroc jedna karte</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Obroc trzy karty</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pl/qpe.ts b/i18n/pl/qpe.ts
index 1ee43c3..8257cce 100644
--- a/i18n/pl/qpe.ts
+++ b/i18n/pl/qpe.ts
@@ -64,28 +64,24 @@
         <source>OK</source>
         <translation>OK</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Dokładnie i silnie dotknij krzyżyk
 aby skalibrować ekran.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Witaj w Opie</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Stan baterii</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Bateria słaba</translation>
     </message>
 </context>
@@ -106,28 +102,24 @@ aby skalibrować ekran.</translation>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Proszę czekać, ładuję ustawienia %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Proszę czekać...</translation>
     </message>
     <message>
         <source>Finish</source>
         <translation>Kończ</translation>
     </message>
-    <message>
-        <source>FirstUseBackground</source>
-        <translation type="obsolete">PierwszeTło</translation>
-    </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unikod</translation>
     </message>
 </context>
 <context>
     <name>Launcher</name>
     <message>
         <source>Launcher</source>
@@ -287,40 +279,24 @@ aby skalibrować ekran.</translation>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informacje</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Data systemowa wydaje się być nieprawidłowa.
 (%1)&lt;/p&gt;&lt;p&gt;Czy chcesz poprawić zegar?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Poziom energii jest krytyczny!
-Wylacz urzadzenie az do naladowania baterii!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="obsolete">Poziom energii bardzo niski.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Bateria zapasowa sie rozladowuje.
-Doladuj baterie zapasowa.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation>wizytowka</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Tryb bezpieczny</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Wystąpił błąd systemu i jest on teraz w Trybie Bezpiecznym. W tym trybie nie są ładowane wtyczki. Używajac Menedżera Wtyczek możesz wyłączyć wtyczki, które powodują awarię systemu.</translation>
     </message>
     <message>
@@ -384,49 +360,39 @@ tą aplikację.</translation>
         <source>Reboot</source>
         <translation>Restartuj system</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Restartuj Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Zamknij system</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="obsolete">&lt;p&gt;
-Te opcje zamykające zostały pierwotnie dodane do użytku deweloperów i dla testów Opie. W normalnym środowisku ich używanie nie jest konieczne.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Zamykanie systemu...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Połączenie synchronizacyjne</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Nieautoryzowany system zada dostepu do tego urzadzenia.&lt;p&gt;Jesli uzywasz Qtopia Desktop w wersji wczesniejszej niz 1.5.1, zaktualizuj ja.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation>Odmów</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Nierozpoznany system żąda dostępu do tego urządzenia.&lt;p&gt;Jeśli zainicjowałeś synchronizację po raz pierwszy  to jest to normalne.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Zezwól</translation>
     </message>
     <message>
diff --git a/i18n/pl/security.ts b/i18n/pl/security.ts
index 8cb7800..b3a663f 100644
--- a/i18n/pl/security.ts
+++ b/i18n/pl/security.ts
@@ -66,60 +66,28 @@ Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
         <source>Login</source>
         <translation type="unfinished">Login</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Synchronizuj</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished">Uwaga</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -194,286 +162,24 @@ Możesz wybrać tylko skonfigurowanego użytkownika.</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished">Anuluj</translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Ustaw hasło</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Zmień hasło</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Podaj hasło</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Błędne hasło</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Podane hasło jest nieprawidłowe.
-Dostęp zabroniony</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Wszystkie</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Żadne</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Wpisz nowe hasło</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Powtórz nowe hasło</translation>
-    </message>
-    <message>
-        <source>Attention</source>
-        <translation type="obsolete">Uwaga</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Wszystkie zakresy użytkownika będę stracone.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Anuluj</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Ustawienia bezpieczeństwa</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Zmień hasło</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Wyczyść hasło</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Wymagaj hasła po uruchomieniu</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Synchronizuj</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Akceptuj synchronizację z sieci:</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Kazdy</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Brak</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Ochrona hasłem jest podstawowym zabezpieczeniem przed przypadkowym dostępem do tego urządzenia.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (domyslny)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Hasło</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Login</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">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="obsolete">Ten przycisk służy do zmiany hasła.
-
-Uwaga: To *nie* jest hasło synchronizacji.</translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="obsolete">Usuń aktualne hasło.
-W dowolnej chwili możesz podać nowe.</translation>
-    </message>
-    <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation type="obsolete">Jeśli włączysz tą opcję, będzie trzeba podawać hasło po każdym rozbudzeniu Zaurusa.</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="obsolete">Jeśli wybierzesz tą opcję, będziesz automatycznie logowany jako użytkownik, którego wybrałeś z listy rozwijanej.
-
-Dla Zaurusa 5x00 jest to zawsze użytkownik &quot;root&quot;.</translation>
-    </message>
-    <message>
-        <source>This drop-down list allows you to select the user for auto-login
-(if enabled above).  
-
-You can only select an actually configured user.</source>
-        <translation type="obsolete">Ta lista rozwijana pozwala na wybór automatycznie logowanego użytkownika
-(jeśli opcja jest włączona powyżej).
-
-Możesz wybrać tylko skonfigurowanego użytkownika.</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="obsolete">Wybierz zakres sieciowy lub podaj nowy.
-
-Ta lista rozwijana służy do wyboru zakresu adresów, z których można łączyć się z Zaurusem.
-
-Na przykład zakres 192.168.1.0/24 pozwala na połączenie (i synchronizację) każdej maszynie z IP pomiędzy 192.168.1.1 i 192.168.1.254.
-
-&quot;Wszystkie&quot; pozwoli na łączenie z *każdego* IP.
-&quot;Żadne&quot; odmówi *każdemu* połączeniu.
-
-Jeśli nie jesteś pewien co wybrać, wybierz &quot;Wszystkie&quot;.</translation>
-    </message>
-    <message>
-        <source>Delete Entry</source>
-        <translation type="obsolete">Usuń wpis</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="obsolete">Usuń wybrany zakres sieciowy z listy
-
-Jeśli wciśniesz ten przycisk, aktualnie wybrany zakres sieciowy zostanie usunięty z listy zakresów sieciowych.
-
-Jeśli wciśniesz ten przycisk przez pomyłkę, to przycisk &quot;Przywróć domyślne&quot;
-przywróci listę do stanu w jakim była przy pierwszym starcie Zaurusa.</translation>
-    </message>
-    <message>
-        <source>Restore Defaults</source>
-        <translation type="obsolete">Przywróć domyślne</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="obsolete">Ten przycisk przywróci listę zakresów sieciowych
-do stanu domyślnego.
-
-Uwaga, wszystkie ręcznie wprowadzone zakresy zostaną usunięte!</translation>
-    </message>
-    <message>
-        <source>Select your sync software</source>
-        <translation type="obsolete">Wybierz oprogramowanie do synchronizacji</translation>
-    </message>
-    <message>
-        <source>IntelliSync</source>
-        <translation type="obsolete">IntelliSync</translation>
-    </message>
-    <message>
-        <source>Qtopia 1.7</source>
-        <translation type="obsolete">Qtopia 1.7</translation>
-    </message>
-    <message>
-        <source>Opie 1.0</source>
-        <translation type="obsolete">Opie 1.0</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Synchronizuj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Akceptuj synchronizację z sieci:</translation>
diff --git a/i18n/pl/snake.ts b/i18n/pl/snake.ts
index a4d7154..8b2137a 100644
--- a/i18n/pl/snake.ts
+++ b/i18n/pl/snake.ts
@@ -13,39 +13,31 @@
         <source>SNAKE!</source>
         <translation>WAZ!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Uzywaj klawiszy strzalek do kierowania
 wezem tak by zjadal myszy. Nie mozesz
 wpadac na sciany, krawedzie i swoj ogon.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Wcisnij dowolny klawisz do uruchomienia</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>     Wynik :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>KONIEC GRY!
  Twoj wynik: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Wcisnij dowolny klawisz a rozpoczniesz gre.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Wcisnij dowolny przycisk by zaczac</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Wcisnij dowolny przycisk by zaczac nowa gre.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pl/sysinfo.ts b/i18n/pl/sysinfo.ts
index 3b040a7..7f80e9a 100644
--- a/i18n/pl/sysinfo.ts
+++ b/i18n/pl/sysinfo.ts
@@ -142,40 +142,24 @@
         <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 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>
@@ -215,28 +199,24 @@ Kliknij i przytrzymaj na module aby zobaczyc wiecej informacji na jego temat lub
         <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 type="obsolete">Czy na pewno chcesz wykonac %1 na tym module?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Zajete (%1 kB)</translation>
     </message>
     <message>
@@ -282,28 +262,24 @@ Kliknij i przytrzymaj na procesie by zobaczyc dodatkowe informacje o nim lub by
         <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 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>
@@ -353,32 +329,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Model:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/pl/tictac.ts b/i18n/pl/tictac.ts
index ddd631f..1d28568 100644
--- a/i18n/pl/tictac.ts
+++ b/i18n/pl/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/pl/today.ts b/i18n/pl/today.ts
index 724e2c9..e61ca72 100644
--- a/i18n/pl/today.ts
+++ b/i18n/pl/today.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Dzisiaj</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Wypełnij wizytowkę</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">Nie znaleziono żadnych 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 żeby uruchomić powiązana aplikacją</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Właściciel </translation>
     </message>
     <message>
diff --git a/i18n/pl/todolist.ts b/i18n/pl/todolist.ts
index 3a4f053..06ec611 100644
--- a/i18n/pl/todolist.ts
+++ b/i18n/pl/todolist.ts
@@ -76,136 +76,68 @@
     <message>
         <source>Edit Task</source>
         <translation>Edytuj zadanie</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>cichy</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>głośny</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie ZróbTo</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Nowe z szablonu</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nowe zadanie</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Kliknij tu żeby stworzyć nowe zadanie.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Edytuj Zadanie</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Kliknij tu żeby zmodyfikować aktualne zadanie.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Zobacz zadanie</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Usuń...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Kliknij tu żeby usunąć aktualne zadanie.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Usuń wszystkie...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Usuń ukończone</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Emituj</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Kliknij tu żeby wysłać aktualne zadanie do innego urządzenia.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Szukaj</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Pokaż ukończone zadania</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Pokaż tylko przeterminowane zadania</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Pokaz terminy końcowe zadań</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Pokaż szybki pasek zadań</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Dane</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategoria</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opcje</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>SzybkaEdycja</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>To jest lista wszystkich aktualnych zadań.
 
 Na liście umieszczone są nastepujące informacje:
 1. Ukończone - zielony &quot;ptaszek&quot; oznacza zadanie ukończone. Kliknij tu aby zakończyć zadanie.
 2. Priorytet - graficzna reprezentacja priorytetu zadania. Kilknij tu podwójnie by go zmodyfikować.
 3. Opis - opis zadania. Kliknij tu aby wybrać zadanie.
 4. Termin końcowy - pokazuje kiedy zadanie ma być ukończone. Ta kolumna może być pokazana lub ukryta przez wybranie Opcje-&gt;&apos;Pokaż terminy końcowe&apos; z powyższego menu.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Wszystkie kategorie</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Brak pamięci</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Program nie był w stanie
 zapisać zmian.
@@ -218,60 +150,44 @@ Wyjść mimo to?</translation>
         <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 ukończone zadania?</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Nieprzypisane</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;Liczba nowych zadań: %1.&lt;p&gt; Czy chcesz dodać je do swojej listy ZrobTo?</translation>
     </message>
     <message>
         <source>New Tasks</source>
         <translation>Nowe zadania</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">Duplikuj</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Priorytet</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Opis</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Termin końcowy</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">Konfiguruj szablony</translation>
-    </message>
-    <message>
         <source>Priority:</source>
         <translation>Priorytet:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Edytor szablonów</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Dodaj</translation>
     </message>
     <message>
diff --git a/i18n/pl/zsafe.ts b/i18n/pl/zsafe.ts
index e13c308..7cb20bc 100644
--- a/i18n/pl/zsafe.ts
+++ b/i18n/pl/zsafe.ts
@@ -1,275 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Czy chcesz usunąć?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Usuń</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nie usuwaj</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Edytuj wpis</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nazwa</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Użytkownik</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Hasło</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Komentarz</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Pole 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Pole 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Nowy wpis</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Nazwa wpisu musi być inna
-niż nazwa kategorii.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Szukaj</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Wpis nie znaleziony</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Pole 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Pole 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Wszystkie</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Tekst</translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="obsolete">Usuń plik tekstowy</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Nie udało się usunięcie pliku tekstowego.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="obsolete">Brak dokumentu.
-Musisz stworzyć nowy dokument</translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="obsolete">Eksportuj plik tekstowy</translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="obsolete">Importuj plik tekstowy</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Nie udał się eksport pliku tekstowego.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Nie udał się import pliku tekstowego.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Wpisz hasło</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Błędne hasło.
-
-ZSafe zostanie zamknięty.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Błędne hasło.
-Spróbuj ponownie?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Tak</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nie.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Pusty dokument lub
-błędne hasło.
-Kontynuować?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nie</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Tak.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Hasło jest puste.
-Wpisz ponownie.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Powtórz hasło</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Hasła muszą być identyczne.
-Wpisz ponownie.</translation>
-    </message>
-    <message>
-        <source>Do you want to save </source>
-        <translation type="obsolete">Czy chcesz zapisać</translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="obsolete">
-teraz?</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Zapisz</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nie zapisuj</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Plik z hasłem zapisany.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Czy chcesz zapisać
-przed wyjściem?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">&amp;Zapisz z
-nowym
-hasłem</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategoria</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Czekaj</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Zbieram ikony...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Twórz nowy dokument ZSafe</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="obsolete">Teraz musisz dwukrotnie
-podać hasło dla nowego
-dokumentu.</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Otwórz dokument ZSafe</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Zapisz dokument ZSafe jako..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Menedżer haseł dla Zaurusa&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe wersja 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">autor: Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">tłumaczenia: Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe wersja 2.1.2&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Ikona</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Pole 1</translation>
@@ -463,34 +202,24 @@ pokazuje listę katalogów i plików</translation>
     <message>
         <source>Please Wait...</source>
         <translation>Proszę czekać...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nie można utworzyć katalogu
-%1
-
-ZSafe zostanie zamknięty.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Zapisz dokument</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Zapisz dokument z &amp;hasłem</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Eksportuj plik tekstowy</translation>
     </message>
     <message>
@@ -553,36 +282,24 @@ ZSafe zostanie zamknięty.</translation>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>P&amp;omoc</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Nazwa</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Pole 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Pole 3</translation>
     </message>
     <message>
@@ -597,40 +314,32 @@ ZSafe zostanie zamknięty.</translation>
         <source>Field 5</source>
         <translation>Pole 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Czy usunąć?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Nie usuwaj</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Edytuj wpis</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Użytkownik</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Nowy wpis</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Nazwa wpisu musi być inna
 niż nazwa kategorii.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Szukaj</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Nie znaleziono wpisu</translation>
@@ -737,84 +446,40 @@ password</source>
         <source>Category</source>
         <translation>Kategoria</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Proszę czekać</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Zbieram ikony...</translation>
     </message>
     <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Menedżer haseł&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.0.1ern&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe Version 2.0.1ern&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">autor: Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Tłumaczenia Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Nowy dokument</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Otwórz dokument</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Zapisz dokument jako..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Twórz nowy dokument ZSafe</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation>Otwórz dokument ZSafe</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Zapisz dokument ZSafe jako..</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nie można utworzyć katalogu
-.../Documents/application
-
-ZSafe zostanie zamknięty.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Nie można utworzyć katalogu
-.../Documents/application/zsafe
-
-ZSafe zostanie zamknięty.</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation>Nowy wpis</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Edytuj kategorię lub wpis</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Usuń kategorię lub wpis</translation>
     </message>
     <message>
@@ -857,32 +522,24 @@ before continuing?</source>
         <translation>
 teraz?</translation>
     </message>
     <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Teraz musisz dwukrotnie
 podać hasło dla nowego
 dokumentu.</translation>
     </message>
     <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe wersja 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZSafe wersja 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/addressbook.ts b/i18n/pt/addressbook.ts
index a7a6ad9..13e804f 100644
--- a/i18n/pt/addressbook.ts
+++ b/i18n/pt/addressbook.ts
@@ -19,136 +19,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Vazio</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Contactos</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Contacto</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Novo</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Apagar</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Procurar</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Enviar EMail</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Irradiar Entrada</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Meus Dados</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Não pode editar enquanto sincroniza</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Editar os Meus Dados</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Editar Endereço</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contactos - Meus Dados</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Não há espaço para
 guardar os dados. 
 Liberte algum e tente de novo.
 
 Sair na mesma?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Vazio</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importar cartão de visita</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Fechar Procura</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Gravar todos os Dados</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Configuração</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Não Encontrado</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Cartões</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Cartão</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Iniciar Procura</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Tipo de ficheiro correcto?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
@@ -169,28 +93,24 @@ Tem a certeza que o quer abrir?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Tem a certeza que quer adicionar o
 contacto para %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Sim para &amp;Todos</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Exportar vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Tem de selecionar um contacto!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Tem de selecionar um nome de ficheiro!</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1385,180 +1305,13 @@ todos os dispositivos!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Exportar vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Meus Dados</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Telefone (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Telemóvel (Empresa)</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">EMail Principal</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Outros EMails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Telefone (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Telemóvel (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Escritório</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Profissão</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistente</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Chefe</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Esposa</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Sexo</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Nascimento</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Aniversário</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Alcunha</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Filhos</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Título</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Nome do Meio</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Apelido</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Sufixo</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Gravar Como</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Título Profissional</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Departamento</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Empresa</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Rua (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Cidade (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Estado (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Cód. Postal (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">País (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Pager (Empresa)</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">WebSite (Empresa)</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Rua (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Cidade (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Estado (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Cód. Postal (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">País (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">WebSite (Pessoal)</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notas</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt/advancedfm.ts b/i18n/pt/advancedfm.ts
index a2b4b3e..133ecbf 100644
--- a/i18n/pt/advancedfm.ts
+++ b/i18n/pt/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Não foi possível mudar o nome</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">A directoria não existe</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Copiar Como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Resultado do AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Enviar por Infravermelhos</translation>
     </message>
     <message>
@@ -129,141 +125,60 @@
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Enviar Ficheiro (IR)</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar para a mesma Directoria</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Não foi possivel copiar
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">para
-</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Não foi possível mover
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Adicionar aos Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Acções</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Selecionar Tudo</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Apagar mesmo
-os ficheiros %1?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Apagar Directoria?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Copiar mesmo
-os ficheiros %1?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>O ficheiro existe!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-existe. Sobrepor?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">já existe.
-Quer mesmo apagá-lo?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 existe. Sobrepor?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Não foi possível copiar %1 para %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Gestor de Ficheiros Avançado
-é copyright 2002-2003
-L.J.Potter &lt;llornkcor@handhelds.org&gt;
-e licenciado sob a licença GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Atalho para Directoria</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Apagar a directoria actual dos atalhos</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Não é possível apagar a directoria
-dos atalhos.
-Não existe na lista!</translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation>Procurar Ficheiro</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Apagar mesmo
-os ficheiros %1
-e os seus conteúdos?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">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 </source>
         <translation>Copiar</translation>
     </message>
     <message>
@@ -274,34 +189,24 @@ e os seus conteúdos?</translation>
         <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="obsolete">Não foi possível copiar
-%1
-para
-%2</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/appearance.ts b/i18n/pt/appearance.ts
index 4893023..8b3a2e6 100644
--- a/i18n/pt/appearance.ts
+++ b/i18n/pt/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Editar...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Apagar</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Gravar</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Forçar o estilo nas aplicações todas.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Desactivar estilo para as seguintes aplicações (pode usar &lt;b&gt;*&lt;/b&gt; para escolher várias):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Ficheiro(s) Binário(s)</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <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>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Reiniciar</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Deseja reiniciar %1 agora?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sim</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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.
@@ -161,52 +129,24 @@ Clique aqui para escolher um esquema.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Clique aqui para mudar as cores do esquema actual.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Clique aqui para apagar um esquema de cores da lista.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Clique aqui para dar um nome e gravar o esquema de cores actual.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Clique aqui para permitir que todas as aplicações usem as configurações globais de aparência.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Se for necessário, é possível desactivar determinados detalhes por cada aplicação, por exemplo se uma aplicação não ficar bem com os parametros globais.
-
-Nesta área poderá selecionar a aplicação e a configuração que deseja desactivar.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Clique aqui para adicionar um aplicação à lista acima.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Clique aqui para apagar uma aplicação selecionada.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Clique aqui para mover a aplicação selecionada para cima.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Clique aqui para mover a aplicação selecionada para baixo.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Clique aqui para escolher um estilo para janelas com pastas (tal como esta aplicação). Os estilos disponíveis são:
 
 1. Pastas - pastas normais apenas com texto
 2. Pastas com Icones - pastas com icones para cada pasta e texto adicional na pasta selecionada
 3. Listas - uma lista vertical com as várias opções
 4. Listas com Icones - uma lista vertical com icones</translation>
diff --git a/i18n/pt/aqpkg.ts b/i18n/pt/aqpkg.ts
index 1557a0e..2eb24ca 100644
--- a/i18n/pt/aqpkg.ts
+++ b/i18n/pt/aqpkg.ts
@@ -198,56 +198,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Não foi possível abrir o ficheiro de status - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Não foi possível criar o ficheiro de estado temporário - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Não foi possível executar o ipkg</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Não foi possível abrir: </translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">A criar a directoria</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Ligado %1 a %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Falhou a ligação de %1 a %2</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">%1 apagado</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Falhou a remoção de %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Apagado</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Falhou a remoção</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt/backup.ts b/i18n/pt/backup.ts
index bea9f65..38088e7 100644
--- a/i18n/pt/backup.ts
+++ b/i18n/pt/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Cópia de Segurança... a processar...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Erro do sitema:
 </translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Mensagem</translation>
@@ -27,44 +23,36 @@
         <source>Ok</source>
         <translation>Ok</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Detalhes</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Falhou a Cópia de Segurança!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Cópia de Segurança bem sucedida.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Escolha algo para repôr.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Falhou a Reposição.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Não foi possível abrir o ficheiro %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Reposição bem sucedida.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -98,52 +86,44 @@
         <source>Backup And Restore</source>
         <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Cópia de Segurança</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Aplicações</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Gravar Para</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Cópia de Segurança</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Reposição</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Escolha a fonte</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Coluna 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Reposição</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Actualizar a lista de ficheiros</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/calculator.ts b/i18n/pt/calculator.ts
index e4a0fff..c0bbc62 100644
--- a/i18n/pt/calculator.ts
+++ b/i18n/pt/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Calculadora Experimental</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculadora</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/pt/calibrate.ts b/i18n/pt/calibrate.ts
index 4c9cd2d..dd8c178 100644
--- a/i18n/pt/calibrate.ts
+++ b/i18n/pt/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Clique na cruz com firmeza e precisão
 para calibrar o seu ecrâ.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Bem-Vindo ao Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt/checkbook.ts b/i18n/pt/checkbook.ts
index d774404..f13f566 100644
--- a/i18n/pt/checkbook.ts
+++ b/i18n/pt/checkbook.ts
@@ -29,48 +29,24 @@
         <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 type="obsolete">Poupanças</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Cheques</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Mercado Monetário</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Fundos Mútuos</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -93,32 +69,24 @@
         <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 type="obsolete">Saldo Actual: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -173,28 +141,24 @@ Para ordenar por um campo específico, clique no nome da coluna.</translation>
         <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 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>
@@ -646,109 +610,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Automóvel</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Contas</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CDs</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Roupa</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Informática</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVDs</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Electrónica</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Entretenimento</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Comida</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Combustível</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Vários</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Filmes</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Rendas</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <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 type="obsolete">Vencimento</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Despesas Familiares</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <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 type="obsolete">Electrónico</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt/clock.ts b/i18n/pt/clock.ts
index c1fc55d..b436c10 100644
--- a/i18n/pt/clock.ts
+++ b/i18n/pt/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Toque</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Relógio</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Cronómetro</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Começar</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Definir Alarme</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Definir data e hora.</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarme Ligado</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarme Desligado</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Relógio: O alarme já passou.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarme às: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -234,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Definir Alarme</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Repetir o toque
-(minutos)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">Alarme MP3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tudo</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Áudio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt/datebook.ts b/i18n/pt/datebook.ts
index bde930e..34332f4 100644
--- a/i18n/pt/datebook.ts
+++ b/i18n/pt/datebook.ts
@@ -333,24 +333,32 @@ Sair na mesma?</translation>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -406,59 +414,24 @@ Sair na mesma?</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>
-        <comment>Friday</comment>
-        <translation type="obsolete">Se</translation>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">Sá</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">Do</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>Hora Início</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>Hora Fim</translation>
     </message>
     <message>
@@ -571,28 +544,24 @@ Sair na mesma?</translation>
     <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 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>
diff --git a/i18n/pt/embeddedkonsole.ts b/i18n/pt/embeddedkonsole.ts
index c88c354..f46f484 100644
--- a/i18n/pt/embeddedkonsole.ts
+++ b/i18n/pt/embeddedkonsole.ts
@@ -19,72 +19,44 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;b&gt;Comandos Sugeridos&lt;/b&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Micro</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Pequena</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
         <source>Show command list</source>
         <translation>Mostrar Lista</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Esconder Lista</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Pastas em Baixo</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Verde em Preto</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Preto em Branco</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Branco em Preto</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Preto em Transparente</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Preto em Vermelho</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Vermelho em Preto</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Verde em Amarelo</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Azul em Magenta</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Magenta em Azul</translation>
     </message>
     <message>
@@ -99,32 +71,24 @@
         <source>Blue on Black</source>
         <translation>Azul em Preto</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>Âmbar em Preto</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Cores</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Fontes</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opções</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
@@ -139,28 +103,24 @@
         <source>Down</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Editar</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Nenhum</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Esquerda</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Direita</translation>
     </message>
     <message>
@@ -183,28 +143,24 @@
         <source>Command List</source>
         <translation>Lista de Comandos</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Quebra</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Usar Som</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Tabs em Cima</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/fifteen.ts b/i18n/pt/fifteen.ts
index eb3fd39..cf16113 100644
--- a/i18n/pt/fifteen.ts
+++ b/i18n/pt/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Aleatório</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Resolver</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Puzzle</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/go.ts b/i18n/pt/go.ts
index 074cab5..46e6f0a 100644
--- a/i18n/pt/go.ts
+++ b/i18n/pt/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Uma linha.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Eu passo</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisioneiros: preto %1, branco %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Jogar</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt/kbill.ts b/i18n/pt/kbill.ts
index afbd6b2..9dcffc0 100644
--- a/i18n/pt/kbill.ts
+++ b/i18n/pt/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Ficheiro</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Pausar Jogo</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;A História&lt;/b&gt;&lt;p&gt;Mais uma vez, o destino do mundo está nas suas mãos! Um hacker malicioso, conhecido apenas pela alcunha &apos;Bill&apos;, criou o mais perigoso vírus informático. Um vírus tão malicioso que é capaz de transformar um computador normal numa torradeira. Para piorar, o &apos;Bill&apos; clonou-se em biliões de micro-Bills, onde o propósito de cada um é apenas a infestação do tal vírus. O vírus foi disfarçado como um sistema operativo popular. Como administrador de sistemas e exterminador, o seu objectivo é evitar o sucesso do &apos;Bill&apos; nesta tarefa.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>A história do kBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>As regras do kBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;p&gt;As Regras&lt;/b&gt;&lt;p&gt;O kBill foi cuidadosamente desenhado e desenvolvido de forma a ser facilmente usado pela família toda, incluíndo a pequena Sally. Anos - quer dizer - dias de testes e consultoria pelos designers mais baratos de interfaces humanas resultaram num jogo fácil de usar, ainda que não tão fácil como um Macintosh.&lt;p&gt;&lt;ul&gt;&lt;li&gt;Mate os Bills (clique neles)&lt;/li&gt;&lt;li&gt;Reinicie os computadores (clique neles)&lt;/li&gt;&lt;li&gt;Pegue nos sistemas trocados e retorne-os ao computador (arraste-os)&lt;/li&gt;&lt;li&gt;Arraste os baldes para estinguir os fogos&lt;/li&gt;&lt;li&gt;A pontuação é baseada no tempo que aguentar, com bónus por cada Bill morto.&lt;/li&gt;&lt;/ul&gt;&lt;p&gt;Quanto ao resto, provavelmente conseguirá descobrir por si próprio. Nós conseguimos, portanto não deve ser assim tão difícil</translation>
     </message>
     <message>
diff --git a/i18n/pt/keypebble.ts b/i18n/pt/keypebble.ts
index 8b4ccbd..977371e 100644
--- a/i18n/pt/keypebble.ts
+++ b/i18n/pt/keypebble.ts
@@ -18,28 +18,24 @@
 data, the remote host has probably dropped the
 connection.</source>
         <translation>Erro ao ler os dados.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>Erro desconhecido</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">À espera da inicialização do servidor...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>À espera do nome do ambiente de trabalho...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Ligado a %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Erro de Protocolo: recebida a mensagem %1 em vez de uma actualização.</translation>
     </message>
     <message>
diff --git a/i18n/pt/launchersettings.ts b/i18n/pt/launchersettings.ts
index bd541a1..ea1b484 100644
--- a/i18n/pt/launchersettings.ts
+++ b/i18n/pt/launchersettings.ts
@@ -203,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/pt/libbatteryapplet.ts b/i18n/pt/libbatteryapplet.ts
index 88a3abc..bc6b816 100644
--- a/i18n/pt/libbatteryapplet.ts
+++ b/i18n/pt/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Fechar</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>A carregar</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Percentagem de bateria restante</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Estado da bateria:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bom</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
@@ -41,64 +33,44 @@
         <source>On backup power</source>
         <translation>Em energia de reserva</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Energia externa</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Energia externa desligada</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Tempo de bateria restante</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Estado da bateria</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>erro ao ler os dados</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>A carregar as duas baterias</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Percentagem de bateria restante:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Tempo de bateria restante:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Adaptador externo sem bateria</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>sem dados</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">Ipaq</translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Acessório</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/libclockapplet.ts b/i18n/pt/libclockapplet.ts
index df3d209..bd02d12 100644
--- a/i18n/pt/libclockapplet.ts
+++ b/i18n/pt/libclockapplet.ts
@@ -1,26 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherClock</name>
     <message>
-        <source>Information</source>
-        <translation type="obsolete">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 type="obsolete">&lt;p&gt;A data do sistema não parece válida.
-(%1)&lt;/p&gt;&lt;p&gt;Deseja corrigi-la?&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Set time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/libkppp.ts b/i18n/pt/libkppp.ts
index 45044d5..910acae 100644
--- a/i18n/pt/libkppp.ts
+++ b/i18n/pt/libkppp.ts
@@ -1,61 +1,41 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AccountWidget</name>
     <message>
-        <source>&amp;Edit...</source>
-        <translation type="obsolete">&amp;Editar...</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected account</source>
         <translation>Permite modificar a conta selecionada</translation>
     </message>
     <message>
-        <source>&amp;New...</source>
-        <translation type="obsolete">&amp;Novo...</translation>
-    </message>
-    <message>
         <source>Create a new dialup connection
 to the Internet</source>
         <translation>Criar uma nova ligação à internet
 via modem</translation>
     </message>
     <message>
-        <source>Co&amp;py</source>
-        <translation type="obsolete">Co&amp;piar</translation>
-    </message>
-    <message>
         <source>Makes a copy of the selected account. All
 settings of the selected account are copied
 to a new account, that you can modify to fit your
 needs</source>
         <translation>Cria uma cópia da conta selecionada. 
 Serão copiados todos os valores da conta,
 que poderá modificar</translation>
     </message>
     <message>
-        <source>De&amp;lete</source>
-        <translation type="obsolete">&amp;Apagar</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Deletes the selected account
 
 &lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
         <translation>&lt;p&gt;Apaga a conta selecionada&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Maximum number of accounts reached.</source>
-        <translation type="obsolete">Atinjido o máximo de contas.</translation>
-    </message>
-    <message>
         <source>No account selected.</source>
         <translation>Nenhuma conta selecionada.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the account &quot;%1&quot;?</source>
         <translation>Tem a certeza que quer apagar
 a conta &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Confirmar</translation>
@@ -107,40 +87,24 @@ a conta &quot;%1&quot;?</translation>
     <message>
         <source>Execute Programs</source>
         <translation>Executar Programa</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>Executar</translation>
     </message>
     <message>
         <source>You must enter a unique account name</source>
         <translation>O nome da conta tem de ser único</translation>
     </message>
-    <message>
-        <source>Byte</source>
-        <translation type="obsolete">Byte</translation>
-    </message>
-    <message>
-        <source>KB</source>
-        <translation type="obsolete">KB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="obsolete">GB</translation>
-    </message>
 </context>
 <context>
     <name>AuthWidget</name>
     <message>
         <source>Authentication: </source>
         <translation>Autenticação:</translation>
     </message>
     <message>
         <source>Script-based</source>
         <translation>Baseado em script</translation>
     </message>
     <message>
@@ -346,49 +310,24 @@ some circumstances.</source>
 servidores DNS especificados no ficheiro &lt;tt&gt;/etc/resolv.conf&lt;/tt&gt;
 serão temporariamente desactivados durante o
 tempo da ligação. Quando a ligação terminar, esses
 valores serão repostos.
 
 Geralmente esta opção é desnecessária. 
 Use esta opção apenas se necessitar dela.</translation>
     </message>
 </context>
 <context>
     <name>DevicesWidget</name>
     <message>
-        <source>Allows you to modify the selected account</source>
-        <translation type="obsolete">Permite modificar a conta selecionada</translation>
-    </message>
-    <message>
-        <source>Create a new dialup connection
-to the Internet</source>
-        <translation type="obsolete">Criar uma nova ligação à internet
-via modem</translation>
-    </message>
-    <message>
-        <source>Makes a copy of the selected account. All
-settings of the selected account are copied
-to a new account, that you can modify to fit your
-needs</source>
-        <translation type="obsolete">Cria uma cópia da conta selecionada. 
-Serão copiados todos os valores da conta,
-que poderá modificar</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Deletes the selected account
-
-&lt;font color=&quot;red&quot;&gt;&lt;b&gt;Use with care!&lt;/b&gt;&lt;/font&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Apaga a conta selecionada&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>No devices selected.</source>
         <translation>Nenhum dispositivo selecionado.</translation>
     </message>
     <message>
         <source>Are you sure you want to delete
 the device &quot;%1&quot;?</source>
         <translation>Tem a certeza que deseja remover
 o dispositivo &quot;%1&quot;?</translation>
     </message>
     <message>
         <source>Confirm</source>
         <translation>Confirmar</translation>
@@ -401,28 +340,24 @@ o dispositivo &quot;%1&quot;?</translation>
         <source>Edit Device: </source>
         <translation>Editar Dispositivo:</translation>
     </message>
     <message>
         <source>&amp;Device</source>
         <translation>&amp;Dispositivo</translation>
     </message>
     <message>
         <source>&amp;Modem</source>
         <translation>&amp;Modem</translation>
     </message>
     <message>
-        <source>You must enter a unique account name</source>
-        <translation type="obsolete">O nome da conta tem de ser único</translation>
-    </message>
-    <message>
         <source>Allows you to modify the selected device</source>
         <translation>Permite modificar o dispositivo selecionado</translation>
     </message>
     <message>
         <source>Create a new device</source>
         <translation>Criar um dispositivo novo</translation>
     </message>
     <message>
         <source>Makes a copy of the selected device. All
 settings of the selected device are copied
 to a new device, that you can modify to fit your
 needs</source>
@@ -979,32 +914,24 @@ o seu modem</translation>
         <source>Modem failure</source>
         <translation>Falha no modem</translation>
     </message>
     <message>
         <source>A critical failure appeard while testing the modem</source>
         <translation>Ocorreu um erro crítico durante o teste ao modem</translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
         <translation>&amp;Contas</translation>
     </message>
     <message>
-        <source>&amp;Device</source>
-        <translation type="obsolete">&amp;Dispositivo</translation>
-    </message>
-    <message>
-        <source>&amp;Modem</source>
-        <translation type="obsolete">&amp;Modem</translation>
-    </message>
-    <message>
         <source>&amp;Devices</source>
         <translation>&amp;Dispositivos</translation>
     </message>
 </context>
 <context>
     <name>PPPdArguments</name>
     <message>
         <source>Customize pppd Arguments</source>
         <translation>Personalziar os argumentos do pppd</translation>
     </message>
     <message>
         <source>Argument:</source>
@@ -1463,31 +1390,24 @@ Peça ao administrador para criar este ficheiro (mesmo que seja vazio) com as pe
         <translation>&lt;qt&gt;Selecionou o método PAP ou CHAP para autenticação e tem de fornecer o utilizador e palavra chave de acesso!&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Cannot create PAP/CHAP authentication&lt;br&gt;file &quot;%1&quot;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Não foi possível criar o ficheiro de autenticação&lt;br&gt;&quot;%1&quot; para o PAP ou CHAP&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>You must specify a telephone number!</source>
         <translation>Tem de especificar um número de telefone!</translation>
     </message>
 </context>
 <context>
-    <name>QObject::ModemWidget</name>
-    <message>
-        <source>Modem timeout:</source>
-        <translation type="obsolete">Tempo de inactividade da ligação:</translation>
-    </message>
-</context>
-<context>
     <name>ScriptWidget</name>
     <message>
         <source>Add</source>
         <translation>Adicionar</translation>
     </message>
     <message>
         <source>Insert</source>
         <translation>Inserir</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Remover</translation>
diff --git a/i18n/pt/libliquid.ts b/i18n/pt/libliquid.ts
index 00d5dfd..75e38d7 100644
--- a/i18n/pt/libliquid.ts
+++ b/i18n/pt/libliquid.ts
@@ -1,75 +1,68 @@
 <!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 type="unfinished">Estilo Líquido</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Sem transparências</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Tracejado, cor do fundo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Tracejado, cor dos botões</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Tracejado transparente, cor do fundo</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Tracejado transparente, cor do botão</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Configurar transparência</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Cor do menu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Cor do texto</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Opacidade</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Usar sombras no texto do menu</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Botões planos na barra de ferramentas</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Contraste do tracejado</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Líquido</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">Estilo Líquido por Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libopiepim2.ts b/i18n/pt/libopiepim2.ts
index 824c713..1bae125 100644
--- a/i18n/pt/libopiepim2.ts
+++ b/i18n/pt/libopiepim2.ts
@@ -1,164 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Botão do Calendário</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Botão de Contactos</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Botão do Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Botão do E-Mail</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Botão do Início</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Botão de Gravação</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Mostrar Rodar</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Em Baixo+Cima</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Em Baixo+Baixo</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Em Baixo+Direita</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Em Baixo+Esquerda</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Em Cima+Cima</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Em Cima+Baixo</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Em Cima+Direita</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Em Cima+Esquerda</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Cor:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Vermelho:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal Alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Escolha cor</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mais</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mais...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo de Conteúdo</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Médio</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Pequeno</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento Repetitivo</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
@@ -357,255 +207,24 @@ e</translation>
         <translation type="unfinished">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">Todos</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Evento Repetitivo</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mês</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Todos:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequência</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Termina Em:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data de Término</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repete Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">SemanaVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data de Término</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dias</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dia</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semanas</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">meses</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mês</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">anos</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">ano</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">e</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-e</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, e</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Sem Repetição</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dia(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repetir Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semana(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Repetir Por</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mês(es)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">ano(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">em</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Hora:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Escolha Hora:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -659,54 +278,24 @@ e</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">DiálogoFicheiro</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Gravar</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">Descrição:</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>Prioridade:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Progresso:</translation>
@@ -715,56 +304,48 @@ e</translation>
         <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>
     </message>
     <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
-    </message>
-    <message>
         <source>Home Web Page: </source>
         <translation>Site Web Pessoal:</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>Telefone Pessoal:</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>Fax Pessoal:</translation>
     </message>
     <message>
@@ -839,28 +420,24 @@ e</translation>
         <source>Every</source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>%1 %2 every </source>
         <translation>todos %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 type="obsolete">Todos os %1 %1</translation>
-    </message>
-    <message>
         <source>Every </source>
         <translation>Todos</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>Segunda</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>Terça</translation>
     </message>
     <message>
@@ -875,36 +452,24 @@ e</translation>
         <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>Documents</source>
-        <translation type="obsolete">Documentos</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Ficheiros</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -919,32 +484,24 @@ e</translation>
         <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 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 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>
diff --git a/i18n/pt/libopieui2.ts b/i18n/pt/libopieui2.ts
index 02965c7..dde0edd 100644
--- a/i18n/pt/libopieui2.ts
+++ b/i18n/pt/libopieui2.ts
@@ -1,418 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Botão do Calendário</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Botão de Contactos</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Botão do Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Botão do E-Mail</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Botão do Início</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Botão de Gravação</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Mostrar Rodar</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Em Baixo+Cima</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Em Baixo+Baixo</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Em Baixo+Direita</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Em Baixo+Esquerda</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Em Cima+Cima</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Em Cima+Baixo</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Em Cima+Direita</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Em Cima+Esquerda</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Cor:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Vermelho:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal Alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Escolha cor</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mais</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mais...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">DiálogoFicheiro</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Gravar</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo de Conteúdo</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Médio</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Pequeno</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">A Rápida Raposa Castanha Salta Sobre O Cão Molenga</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Nome</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Evento Repetitivo</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mês</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Todos:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequência</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Termina Em:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data de Término</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repete Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">SemanaVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data de Término</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dias</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dia</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semanas</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">meses</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mês</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">anos</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">ano</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">e</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-e</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, e</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Sem Repetição</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dia(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repetir Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sáb</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semana(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Repetir Por</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mês(es)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">ano(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -541,285 +137,38 @@ e</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo de Conteúdo</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Description:</source>
-        <translation type="obsolete">Descrição:</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Prioridade:</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Progresso:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Prazo:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Categoria:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">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 type="obsolete">Emprego:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Site Web Emprego:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Telefone Emprego:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Fax Emprego:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Telemóvel Emprego:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Pager Emprego:</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Endereço Casa:&lt;/b&gt; </translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Site Web Pessoal:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Telefone Pessoal:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Fax Pessoal:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Telemóvel Pessoal:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Todos os E-Mails:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Profissão:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistente:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Gestor:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Masculino</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Feminino</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Género:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Esposa:</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Data Nascimento:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Aniversário:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Filhos:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Alcunha:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notas:</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Início:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Fim:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Nota:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">todos %1 %2 </translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">Todos os %1</translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">Todos os %1 %1</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Todos</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Segunda</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Terça</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Quarta</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Quinta</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Sexta</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Sábado</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">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 type="obsolete">Muito Alto</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Alto</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normal</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Baixo</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Muito Baixo</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Localização:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Este é um evento para o dia todo</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">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 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 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 type="obsolete">Todos os %1 %2</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/libqpe.ts b/i18n/pt/libqpe.ts
index 39bcb5d..26e0809 100644
--- a/i18n/pt/libqpe.ts
+++ b/i18n/pt/libqpe.ts
@@ -185,28 +185,24 @@ as categorias.</translation>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Texto não encontrado.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Chegou ao fim, a voltar ao início</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Procurar</translation>
     </message>
     <message>
@@ -448,32 +444,24 @@ Liberte algum espaço e tente
 novamente</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Não foi possível gravar os dados
 do alarme.
 
 Liberte algum espaço e tente
 novamente.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>A</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
@@ -780,44 +768,24 @@ novamente.</translation>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sáb</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Clique para fechar esta janela, perdendo as alterações.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Clique para fechar esta janela.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Clique para fechar esta janela e aplicar as alterações.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Clique para tornar esta janela movível.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Clique para maximizar esta janela para o todo o ecrâ disponível.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Não existe manual de instruções para esta aplicação, no entanto existe ajuda contextual.&lt;p&gt;Para usar a ajuda contextual:&lt;p&gt;&lt;ol&gt;&lt;li&gt;clique e espere no botão de ajuda.&lt;li&gt;quando a barra do título mostrar &lt;b&gt;O que é isto...&lt;/b&gt;, clique num controlo.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>O que é isto...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Tem a certeza que quer apagar
 %1?&lt;/qt&gt;</translation>
@@ -862,40 +830,24 @@ novamente.</translation>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Erro</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="obsolete">Não foi possível encontrar a aplicação</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">Ok</translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="obsolete">Não foi possível iniciar a aplicação</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">D</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/pt/libtodayaddressbookplugin.ts b/i18n/pt/libtodayaddressbookplugin.ts
index d7230ab..305d362 100644
--- a/i18n/pt/libtodayaddressbookplugin.ts
+++ b/i18n/pt/libtodayaddressbookplugin.ts
@@ -1,44 +1,32 @@
 <!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 type="obsolete">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 type="obsolete">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>
-    </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>
diff --git a/i18n/pt/libtodaydatebookplugin.ts b/i18n/pt/libtodaydatebookplugin.ts
index 487369c..05b6ed9 100644
--- a/i18n/pt/libtodaydatebookplugin.ts
+++ b/i18n/pt/libtodaydatebookplugin.ts
@@ -6,83 +6,24 @@
         <translation>[com alarme]</translation>
     </message>
     <message>
         <source>note</source>
         <translation>nota</translation>
     </message>
     <message>
         <source>All day</source>
         <translation>Dia todo</translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">Mostrar localização</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">Active isto se quiser ver a localização de cada marcação</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">Mostrar notas</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">Active isto se quiser ver a nota associada a cada marcação</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">Mostrar apenas as
-próximas marcações</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">Active isto se quiser ver apenas as próximas marcações</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">Mostrar 
-quantas
-marcações?
-</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">Qual o máximo de marcações a mostrar em ordem temporal</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">Quantos dias mais</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">Quantos dias mais deverão estar disponíveis</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">dia(s)</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">apenas hoje</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation>DatebookPluginConfigBase</translation>
     </message>
     <message>
         <source>Show location</source>
         <translation>Mostrar localização</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation>Active isto se quiser ver a localização de cada marcação</translation>
diff --git a/i18n/pt/libtodaytodolistplugin.ts b/i18n/pt/libtodaytodolistplugin.ts
index d862816..1634d79 100644
--- a/i18n/pt/libtodaytodolistplugin.ts
+++ b/i18n/pt/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <source>tasks shown</source>
         <translation>tarefas mostradas</translation>
     </message>
     <message>
         <source>After how many chars should be the info about the task be cut off</source>
         <translation>Cortar dados da tarefa ao fim de quantos caracteres</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation>Cortar linha aos X caracteres</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">tarefas a mostrar</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">Número máximo de tarefas a mostrar</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">Cortar linha aos X caracteres</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">Cortar dados da tarefa ao fim de quantos caracteres</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt/libtodayweatherplugin.ts b/i18n/pt/libtodayweatherplugin.ts
index 733c69f..c057549 100644
--- a/i18n/pt/libtodayweatherplugin.ts
+++ b/i18n/pt/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Pressão:</translation>
         <source>SE </source>
         <translation>SE</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>K/H</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>M/H</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">hPa</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>Hg</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/libwlan.ts b/i18n/pt/libwlan.ts
index c018ea7..cc84872 100644
--- a/i18n/pt/libwlan.ts
+++ b/i18n/pt/libwlan.ts
@@ -1,297 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">Configuração de Rede sem Fios</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Geral</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation type="obsolete">Modo</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation type="obsolete">ESSID</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">Especificar o Ponto de &amp;Acesso</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Channel</source>
-        <translation type="obsolete">Especificar o &amp;Canal</translation>
+        <translation type="unfinished">Geral</translation>
     </message>
     <message>
         <source>any</source>
-        <translation type="obsolete">qualquer</translation>
-    </message>
-    <message>
-        <source>Infrastructure</source>
-        <translation type="obsolete">Infraestrutura</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation type="obsolete">Auto</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation type="obsolete">&quot;Managed&quot;</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation type="obsolete">&quot;Ad-Hoc&quot;</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation type="obsolete">Encriptação</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">&amp;Activar Encriptação</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation type="obsolete">Configuração da &amp;Chave</translation>
-    </message>
-    <message>
-        <source>Key &amp;1</source>
-        <translation type="obsolete">Chave &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation type="obsolete">Chave &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="obsolete">Chave &amp;3</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation type="obsolete">Chave &amp;4</translation>
-    </message>
-    <message>
-        <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Pacotes não encriptados</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Aceitar</translation>
+        <source>SSID</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
-        <translation type="obsolete">&amp;Rejeitar</translation>
-    </message>
-</context>
-<context>
-    <name>WLanGUI</name>
-    <message>
-        <source>General</source>
-        <translation type="unfinished">Geral</translation>
+        <source>Infrastructure</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
         <translation type="unfinished">Auto</translation>
     </message>
     <message>
         <source>Managed</source>
         <translation type="unfinished">&quot;Managed&quot;</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
         <translation type="unfinished">&quot;Ad-Hoc&quot;</translation>
     </message>
     <message>
         <source>Mode</source>
         <translation type="unfinished">Modo</translation>
     </message>
     <message>
-        <source>ESS-ID</source>
-        <translation type="unfinished">ESSID</translation>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished">MAC</translation>
     </message>
     <message>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Rescan Neighbourhood</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Chn</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Encryption</source>
         <translation type="unfinished">Encriptação</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished">&amp;Activar Encriptação</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished">Configuração da &amp;Chave</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished">Chave &amp;1</translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished">Chave &amp;4</translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished">Chave &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished">Chave &amp;3</translation>
     </message>
     <message>
-        <source>AP</source>
-        <translation type="unfinished">PA</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation type="unfinished">Velocidade</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation type="unfinished">Canal</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation type="unfinished">Estação</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation type="unfinished">ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation type="unfinished">Ruído</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation type="unfinished">Qualidade</translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation type="unfinished">Sinal</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation type="unfinished"></translation>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Chave &amp;4</translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
-    <message>
-        <source>WLan Device</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Informação da Interface</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">Canal</translation>
+        <translation type="unfinished">Canal</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Modo</translation>
+        <translation type="unfinished">Modo</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Estação</translation>
+        <translation type="unfinished">Estação</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">PA</translation>
+        <translation type="unfinished">PA</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Velocidade</translation>
+        <translation type="unfinished">Velocidade</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Qualidade</translation>
+        <translation type="unfinished">Qualidade</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Ruído</translation>
+        <translation type="unfinished">Ruído</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Sinal</translation>
+        <translation type="unfinished">Sinal</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/mindbreaker.ts b/i18n/pt/mindbreaker.ts
index 174dcc8..3d7ec95 100644
--- a/i18n/pt/mindbreaker.ts
+++ b/i18n/pt/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>Ven avg: %1 jogadas (%2 jogos)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Ir%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">IrCorrente%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Resposta%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Limpar estatísticas</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Limpar rácio de vencedores?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
     <message>
diff --git a/i18n/pt/minesweep.ts b/i18n/pt/minesweep.ts
index c3b34ec..ec342e5 100644
--- a/i18n/pt/minesweep.ts
+++ b/i18n/pt/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Ganhou!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Explodiu!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Minas</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Nível 1</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Nível 2</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Nível 3</translation>
     </message>
     <message>
diff --git a/i18n/pt/mobilemsg.ts b/i18n/pt/mobilemsg.ts
index bf9588c..02fb0d4 100644
--- a/i18n/pt/mobilemsg.ts
+++ b/i18n/pt/mobilemsg.ts
@@ -1,83 +1,44 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MobileMsg</name>
-    <message>
-        <source>Messages: </source>
-        <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 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 type="obsolete">SMS: %1</translation>
-    </message>
-    <message>
         <source>Nokia</source>
         <translation>Nokia</translation>
     </message>
     <message>
-        <source>Country:</source>
-        <translation type="obsolete">País:</translation>
-    </message>
-    <message>
-        <source>Logo</source>
-        <translation type="obsolete">Logo</translation>
-    </message>
-    <message>
-        <source>Group</source>
-        <translation type="obsolete">Grupo</translation>
-    </message>
-    <message>
-        <source>Picture</source>
-        <translation type="obsolete">Imagem</translation>
-    </message>
-    <message>
-        <source>Message:</source>
-        <translation type="obsolete">Mensagem:</translation>
-    </message>
-    <message>
         <source>EMS</source>
         <translation>EMS</translation>
     </message>
     <message>
-        <source>Tab</source>
-        <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>
diff --git a/i18n/pt/opie-console.ts b/i18n/pt/opie-console.ts
index 6e47c70..ef9af9b 100644
--- a/i18n/pt/opie-console.ts
+++ b/i18n/pt/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>Ficheiro Sincronizado</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>A marcar número: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Falhou</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Falhou a marcação do número.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>A cancelar...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>À procura do modem</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Iniciando...</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Tipo de Terminal</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Esquema de cores</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Tamanho da fonte</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">pequena</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">média</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">grande</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Conversão de quebras de linhas</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Entrada</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Saída</translation>
     </message>
     <message>
diff --git a/i18n/pt/opie-eye.ts b/i18n/pt/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/pt/opie-eye.ts
+++ b/i18n/pt/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/opie-login.ts b/i18n/pt/opie-login.ts
index 3f2270f..dad319c 100644
--- a/i18n/pt/opie-login.ts
+++ b/i18n/pt/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 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 type="obsolete">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>
@@ -41,53 +37,36 @@ precisão para calibrar o ecrâ.</translation>
 </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 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>
diff --git a/i18n/pt/opie-sheet.ts b/i18n/pt/opie-sheet.ts
index 96252f3..b8a949c 100644
--- a/i18n/pt/opie-sheet.ts
+++ b/i18n/pt/opie-sheet.ts
@@ -487,164 +487,24 @@
         <source>Colum&amp;n</source>
         <translation>Colu&amp;na</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation>&amp;Folha</translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>&amp;Função</translation>
     </message>
     <message>
-        <source>&amp;Standard</source>
-        <translation type="obsolete">&amp;Omissão</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="obsolete">Somatório</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="obsolete">&amp;Somatório</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="obsolete">Valor Absoluto</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="obsolete">&amp;Absoluto</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="obsolete">Seno</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="obsolete">Se&amp;no</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="obsolete">Arc-Seno</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="obsolete">A&amp;rco-Seno</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="obsolete">Coseno</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="obsolete">&amp;Coseno</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="obsolete">Arc-Coseno</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="obsolete">Arc-Cos&amp;eno</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="obsolete">Tangente</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="obsolete">&amp;Tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="obsolete">Arc-Tangente</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="obsolete">Arc-Tan&amp;gente</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="obsolete">Arc-Tangende das Cordenadas</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="obsolete">C&amp;oordenadas Arc-Tangente</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="obsolete">Exponencial</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="obsolete">&amp;Exponencial</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="obsolete">Logaritmo</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="obsolete">&amp;Logaritmo</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="obsolete">Elevado</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="obsolete">&amp;Elevado</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="obsolete">&amp;Matemático</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="obsolete">Medi&amp;a</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="obsolete">Máximo</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="obsolete">Má&amp;ximo</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="obsolete">Mínimo</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="obsolete">&amp;Mínimo</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="obsolete">Contador</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="obsolete">&amp;Contador</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="obsolete">E&amp;statística</translation>
-    </message>
-    <message>
         <source>Functions</source>
         <translation>Funções</translation>
     </message>
     <message>
         <source>&amp;Number of rows:</source>
         <translation>&amp;Número de linhas:</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>&amp;Número de colunas:</translation>
     </message>
     <message>
@@ -1102,28 +962,24 @@ http://qtopia.sitebest.com</translation>
     <message>
         <source>&lt;td&gt;Unable to open or parse file!&lt;/td&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <source>Syntax error!</source>
-        <translation type="obsolete">Erro de sintaxe!</translation>
-    </message>
-    <message>
         <source>Search key not found!</source>
         <translation>Não encontrada a tecla de procura!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>&amp;Ordenar</translation>
     </message>
     <message>
         <source>&amp;Options</source>
diff --git a/i18n/pt/opieirc.ts b/i18n/pt/opieirc.ts
index 7a65ac8..f210d43 100644
--- a/i18n/pt/opieirc.ts
+++ b/i18n/pt/opieirc.ts
@@ -64,28 +64,24 @@
         <source>Talking on channel</source>
         <translation>A falar no canal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Canal de discussão</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Escreva aqui as suas mensagens para participar na discussão deste canal</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Versão</translation>
     </message>
     <message>
@@ -153,48 +149,40 @@
         <source>Channel for part not found - desynchronized?</source>
         <translation>Saiu de um canal não existente - de-sincronizado?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Mensagem no canal sem originador conhecido</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Mensagem privada de tipo desconhecido</translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Alteração de alcunha de um utilizador desconhecido</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Saiu um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>tópico alterado para</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Tópico de canal desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Recebido um CTCP PING de</translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">Recebido um VERSÃO CTCP  de</translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>Acção CTCP de um utilizador desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>Acção CTCP de um canal desconhecido - de-sincronizado?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>Acção CTCP com destinatário inválido</translation>
     </message>
     <message>
@@ -273,32 +261,24 @@
         <source>You left channel %1</source>
         <translation>Saíu do canal %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 saíu do canal %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Mensagem de canal de um canal desconhecido %1</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">A sua alcunha mudou para %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 mudou a alcunha para %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 saíu (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -488,36 +468,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>É necessário um nome para o perfil</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>É necessário um servidor</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">É necessária uma porta</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>É necessário uma alcunha</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">É necessário um nome</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>A lista de canais deverá conter nomes
 de canais separados por vírgulas. Os 
 nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -550,28 +522,24 @@ nomes começam por &quot;#&quot; ou &quot;+&quot;</translation>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Editar o perfil de servidor seleccionado actualmente</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Adicionar um perfil de servidor</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Ligação a</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Mensagens do servidor</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Escreva comandos aqui. A lista de comandos está disponível na ajuda do OpieIRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt/opiemail.ts b/i18n/pt/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/pt/opiemail.ts
+++ b/i18n/pt/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/pt/opierec.ts b/i18n/pt/opierec.ts
index c921b06..a105196 100644
--- a/i18n/pt/opierec.ts
+++ b/i18n/pt/opierec.ts
@@ -28,72 +28,40 @@
         <source>Time</source>
         <translation>Hora</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Ficheiros</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation></translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">44100</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">32000</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">22050</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">16000</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">11025</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">8000</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>Limitar Tamanho</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>Sem Limite</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>Directoria</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>Qualidade</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">16bits</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">8bits</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>Entrada</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>Saída</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Opções</translation>
     </message>
     <message>
@@ -103,57 +71,36 @@
     <message>
         <source>Low Disk Space</source>
         <translation>Pouco Espaço em Disco</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Está a ficar com pouco 
 espaço livre</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">segundos</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Tem a certeza que quer apagar o ficheiro seleccionado?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Sim</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Não</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Não foi possível apagar o ficheiro.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Gravador Opie</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Escolha o ficheiro a tocar</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <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>
@@ -170,52 +117,32 @@ the selected file?</source>
         <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 type="obsolete">Gravar</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Localização</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Compressão (ficheiros mais pequenos)</translation>
     </message>
     <message>
-        <source>auto Mute</source>
-        <translation type="obsolete">Silêncio Automático</translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>Silêncio</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Parar</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt/osearch.ts b/i18n/pt/osearch.ts
index a05939a..3f7e36b 100644
--- a/i18n/pt/osearch.ts
+++ b/i18n/pt/osearch.ts
@@ -5,28 +5,24 @@
         <source>OSearch</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Procurar</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Procurar Tudo</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">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>
@@ -91,52 +87,36 @@
         <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 type="obsolete">mostrar tarefas completas</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">mostrar eventos do passado</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">procurar nas datas</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Ficheiro:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Ligação:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Tipo de Conteúdo:</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">procurar conteúdo</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>a procurar %1</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>
diff --git a/i18n/pt/oxygen.ts b/i18n/pt/oxygen.ts
index f7ff7f0..32c3142 100644
--- a/i18n/pt/oxygen.ts
+++ b/i18n/pt/oxygen.ts
@@ -40,40 +40,28 @@
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Electro-negatividade</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Raio Atómico</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Energia de Ionização</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Densidade</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Ponto de Fervura</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Ponto de Derretimento</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
diff --git a/i18n/pt/patience.ts b/i18n/pt/patience.ts
index 10fbbeb..eb20cc6 100644
--- a/i18n/pt/patience.ts
+++ b/i18n/pt/patience.ts
@@ -5,68 +5,44 @@
         <source>Patience</source>
         <translation>Paciência</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Mudar Cartas</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;Ir Para Posição</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Parâmetros</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>A&amp;juda</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Jogar</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Mudar Cartas</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Ir Para Posição</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Virar Uma Carta</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Virar Três Cartas</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harpa</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
diff --git a/i18n/pt/qpe.ts b/i18n/pt/qpe.ts
index bbcae27..02e2d37 100644
--- a/i18n/pt/qpe.ts
+++ b/i18n/pt/qpe.ts
@@ -98,28 +98,24 @@ accurately to calibrate your screen.</source>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Toque no ecrâ para continuar.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Aguarde um momento. A carregar a configuração de %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Aguarde um momento...</translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation type="obsolete">Ecrâ de Fundo no Primeiro Uso</translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation>Finalizar</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Unicode</translation>
     </message>
 </context>
 <context>
@@ -282,40 +278,24 @@ accurately to calibrate your screen.</source>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Informação</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;A data do sistema não parece ser válida.
 (%1)&lt;/p&gt;&lt;p&gt;Deseja acertar o relógio?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">O nível de energia está muito baixo.
-Desligue o dispositivo ou ligue-o à corrente!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="obsolete">O nível de energia da bateria está muito baixo.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">O nível de energia da bateria extra está baixo.
-Deve carregá-la.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation>Cartão de Visita</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Modo de Salvaguarda</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;p&gt;Ocorreu um erro ao iniciar. O sistema está agora em modo de salvaguarda e os &quot;plugins&quot; não foram carregados. Poderá usar o gestor de &quot;plugins&quot; para desactivar os que estiverem a causar o erro.</translation>
     </message>
     <message>
@@ -378,49 +358,39 @@ Termine esta aplicação imediatamente.</translation>
         <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 type="obsolete">&lt;p&gt;
-Estas operações estão disponíveis principalmente para desenvolvimento e testes do sistema Opie. Num ambiente normal, estes conceitos são desnecessários.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Ligação de Sincronização</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;Se estiver a usar uma versão do Ambiente Qtopia mais antigo que a 1.5.1, deverá actualizá-lo.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation>Rejeitar</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Um sistema sem autorização está a requisitar acesso a este dispositivo.&lt;p&gt;É normal se for o primeiro acesso para sincronização.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Permitir</translation>
     </message>
     <message>
diff --git a/i18n/pt/security.ts b/i18n/pt/security.ts
index 632d611..a47d1eb 100644
--- a/i18n/pt/security.ts
+++ b/i18n/pt/security.ts
@@ -65,48 +65,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">Qualquer</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,164 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Mudar Chave</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Mudar chave</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Introduza chave</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Chave incorrecta</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">A chave introduzida está incorrecta.
-Acesso negado</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Qualquer</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Introduza nova chave</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Reintroduza a chave</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Configurações de Segurança</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Mudar chave</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Limpar chave</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Pedir chave ao ligar</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Sincronizar</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Aceitar sincronização da rede:</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (omissão)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Qualquer</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhuma</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;p&gt;O uso de chave permite uma protecção mínima contra acessos pontuais ao dispositivo.</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Palavra Chave</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Entrar</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">Entrar Automaticamente</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
diff --git a/i18n/pt/snake.ts b/i18n/pt/snake.ts
index df6f01e..6696dca 100644
--- a/i18n/pt/snake.ts
+++ b/i18n/pt/snake.ts
@@ -13,39 +13,31 @@
         <source>SNAKE!</source>
         <translation>COBRA!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Use o joypad para guiar a cobra 
 de forma a comer o rato. Tem de 
 evitar bater nas paredes ou na cauda.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Prima uma tecla para começar</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>Pontuação: %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FIM DE JOGO!
 Pontuação: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Prima uma tecla para começar um novo jogo.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>Prima uma tecla para começar</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>Prima uma tecla para começar um jogo novo.</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt/sysinfo.ts b/i18n/pt/sysinfo.ts
index 871134b..0c84bfd 100644
--- a/i18n/pt/sysinfo.ts
+++ b/i18n/pt/sysinfo.ts
@@ -142,40 +142,24 @@
         <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 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>
@@ -215,28 +199,24 @@ Clique e espere num módulo para ver informação adicional, ou para o remover d
         <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 type="obsolete">Deseja mesmo executar %1 para este módulo?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>: %1 kB</translation>
     </message>
     <message>
@@ -282,28 +262,24 @@ Clique e espere num processo para ver informação adicional, ou para lhe enviar
         <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 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>
@@ -353,32 +329,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Modelo:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/pt/tableviewer.ts b/i18n/pt/tableviewer.ts
index 26a8119..e91de60 100644
--- a/i18n/pt/tableviewer.ts
+++ b/i18n/pt/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">Não foi possível atribuir o valor por omissão para o tipo %1. A chave não foi adicionada.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">Não foi encontrado nenhum tipo válido para o comando DataElem::setField(%1, %2)</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Limpar</translation>
     </message>
     <message>
         <source>key</source>
         <translation>chave</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/pt/tictac.ts b/i18n/pt/tictac.ts
index 7af795d..90c6431 100644
--- a/i18n/pt/tictac.ts
+++ b/i18n/pt/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/pt/today.ts b/i18n/pt/today.ts
index 09fdd71..a78b877 100644
--- a/i18n/pt/today.ts
+++ b/i18n/pt/today.ts
@@ -5,40 +5,32 @@
         <source>Today</source>
         <translation type="unfinished">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 type="obsolete">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>
-    <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
@@ -63,83 +55,35 @@
         <source>Move Up</source>
         <translation>Mover para Cima</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>Mover para Baixo</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>activar/ordenar</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">iniciar automaticamente
-quando ligar?
-(apenas Opie)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">minutos inactivo</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>Vários</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">Active aqui se quiser que o &quot;hoje&quot; seja iniciado ao ligar o dispositivo.</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">Qual o intervalo de inactividade, em minutos, para que, ao ligar, o&quot;hoje&quot; seja iniciado </translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">Tamanho do icone</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">Altere o tamanho do icone, em pixeis</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">Reler</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">Qual o intervalo de actualização</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">seg</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">nunca</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>Active ou desactive cada extra ou use os cursores para alterar a ordem</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>Configuração do &quot;Hoje&quot;</translation>
     </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">Barra Pequena</translation>
-    </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation>Form1</translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation>Active aqui se quiser que o &quot;hoje&quot; seja iniciado ao ligar o dispositivo.</translation>
     </message>
     <message>
diff --git a/i18n/pt/todolist.ts b/i18n/pt/todolist.ts
index ccd8d99..95455d1 100644
--- a/i18n/pt/todolist.ts
+++ b/i18n/pt/todolist.ts
@@ -76,206 +76,118 @@
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarefa</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>silêncio</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>alto</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Lista de Tarefas do Opie</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Novo a partir de exemplo</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nova Tarefa</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Clique aqui para criar uma nova tarefa.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Editar Tarefa</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Clique aqui para modificar uma tarefa.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Ver Tarefa</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Apagar...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Clique aqui para remover a tarefa actual.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Apagar Todas...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Remoção completa</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Irradiar</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Clique aqui para irradiar a tarefa actual para outro dispositivo.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Procurar</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Mostrar tarefas completas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostrar apenas tarefas atrazadas</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostrar data limite das tarefas</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostrar barra de tarefas rápidas</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Dados</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Categoria</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opções</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Edição Rápida</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Esta é a lista de todas as tarefas actuais.
 
 Esta lista mostra a seguinte informação:
 1. Completadas - o visto verde indica que a tarefa está completa. Clique aqui para completar a tarefa.
 2. Prioridade - uma representação gráfica da prioridade da tarefa. Faça duplo clique para a modificar.
 3. Descrição - descrição da tarefa. Clique aqui para a seleccionar.
 4. Data Limite - mostra a data limite para a execução da tarefa. Esta coluna pode ser visível ou não a partir do menu &quot;Opções-&gt;Mostrar data limite das tarefas&quot;.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Todas as Categorias</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Sem espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Não foi possível gravar 
 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 type="obsolete">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 type="obsolete">Duplicar</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Descrição</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Data Limite</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
diff --git a/i18n/pt/usermanager.ts b/i18n/pt/usermanager.ts
index 6bd4f13..88b9a8b 100644
--- a/i18n/pt/usermanager.ts
+++ b/i18n/pt/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>Adicionar Grupo</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>Editar Grupo</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">Gestor de Users do OPIE</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>Gestor de Utilizadores do Opie</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>Adicionar User</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/pt/zsafe.ts b/i18n/pt/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/pt/zsafe.ts
+++ b/i18n/pt/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/pt_BR/addressbook.ts b/i18n/pt_BR/addressbook.ts
index 0146bea..c25806f 100644
--- a/i18n/pt_BR/addressbook.ts
+++ b/i18n/pt_BR/addressbook.ts
@@ -20,136 +20,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Não Preenchido</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
-        <source>New</source>
-        <translation type="obsolete">Novo</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Edit</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Localizar</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Ver</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>Editar Meus Detalhes Pessoais</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Editar Endereço</translation>
-    </message>
-    <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Impossível salvar informação.
 Libere algum espaço e
 tente novamente.
 
 Sair assim mesmo?</translation>
     </message>
     <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Meus Detalhes Pessoais</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Apagar</translation>
-    </message>
-    <message>
         <source>Contacts</source>
         <translation>Contatos</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Impossível editar dados durante sincronização</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Contato</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Não Preenchido</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Escrever E-mail Para</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Enviar Registro</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Contatos - Meus Detalhes Pessoais</translation>
     </message>
     <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Importar vCard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Fechar Busca</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Salvar Tudo</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Configuração</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Não Encontrado</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Lista</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Cartões</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Cartão</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Iniciar Busca</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Tipo de arquivo correto ?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Sim</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Não</translation>
     </message>
     <message>
@@ -170,28 +94,24 @@ Deseja mesmo abrí-lo?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Deseja mesmo adicionar contato para
 %1 ?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Todos Sim</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Exportar vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Você deve selecionar um contato !</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Você deve especificar um nome de arquivo !</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1385,180 +1305,13 @@ fornecido livremente !</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Exportar vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Meus Detalhes Pessoais</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Telefone Comercial</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Fax Comercial</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Celular Comercial</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">E-mail Padrão</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">E-mails</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Tefone Residencial</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Fax Residencial</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Celular Pessoal</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Escritório</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Profissão</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Assistente</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Gerente</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Esposa</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Sexo</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Aniverário</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Casamento</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Apelido</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Crianças</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Título</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Nome do Meio</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Sobrenome</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Sufixo</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Arquivar Como</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Título Profissional</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Departamento</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Compania</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Endereço Comercial</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Cidade</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Estado</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">CEP</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">País</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Pager Comercial</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Página Web Comercial</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Endereço Residencial</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Cidade</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Estado</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">CEP</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">País</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Página Web Pessoal</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Notas</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt_BR/advancedfm.ts b/i18n/pt_BR/advancedfm.ts
index ab75cb0..62b15b7 100644
--- a/i18n/pt_BR/advancedfm.ts
+++ b/i18n/pt_BR/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>Não</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Nota</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Não pude renomear</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Este diretório não existe</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Copiar Como</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Saída do AdvancedFm</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Transmissão Advancedfm</translation>
     </message>
     <message>
@@ -129,140 +125,60 @@
         <source>Properties</source>
         <translation>Propriedades</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Transmitir Arquivo</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Copiar no Mesmo Dir</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Não pude copiar
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">para
-</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Não pude mover
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Adicionar à Documentos</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Ações</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Selecioanr Tudo</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Realmente remover
-%1 arquivos?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Remover Diretório?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Copiar realmente
-%1 arquivos?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Arquivo Existe!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-existe. Sobrescreve ?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">já existe.
-Você realmente deseja remover?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 existe. Sobrescreve ?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Impossível copiar %1 para %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Gereciador de Arquivo Avançado
-é copyright 2002-2003 por
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-e é licenciado sob a GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Adicionar aos Marcadores</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Remover Diretório Atual dos Marcadores</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Impossível remover diretório atual
-dos marcadores.
-Ele não está nos marcadores!</translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation>Busca Arquivo</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Remove mesmo %1
-e todo seu conteúdo?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Remove mesmo
-%1?</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Copia</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Como</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>AdvancedFm :: </translation>
     </message>
     <message>
@@ -273,34 +189,24 @@ e todo seu conteúdo?</translation>
         <source>Switch to View 1</source>
         <translation>Mudar para Visão 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Mudar para Visão 2</translation>
     </message>
     <message>
         <source>Not Yet Implemented</source>
         <translation>Não Implementado</translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="obsolete">Impossível copiar 
-%1 
-para 
-%2</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;p&gt;Cannot remove current directory from bookmarks. It is not bookmarked!&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/calculator.ts b/i18n/pt_BR/calculator.ts
index ce1c47f..e0c02fc 100644
--- a/i18n/pt_BR/calculator.ts
+++ b/i18n/pt_BR/calculator.ts
@@ -110,39 +110,31 @@
         <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 type="obsolete">Calculadora Experimental</translation>
-    </message>
-    <message>
         <source>Calculator</source>
         <translation type="unfinished">Calculadora</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/pt_BR/calibrate.ts b/i18n/pt_BR/calibrate.ts
index 8052e9f..9eff2d8 100644
--- a/i18n/pt_BR/calibrate.ts
+++ b/i18n/pt_BR/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Toque os alvos firme e acuradamente
 para calibrar sua tela.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Bemvindo ao Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/clock.ts b/i18n/pt_BR/clock.ts
index 6e802b9..f93aded 100644
--- a/i18n/pt_BR/clock.ts
+++ b/i18n/pt_BR/clock.ts
@@ -36,72 +36,32 @@
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
         <source>Stop</source>
         <translation>Parar</translation>
     </message>
     <message>
-        <source>Clock</source>
-        <translation type="obsolete">Relógio</translation>
-    </message>
-    <message>
         <source>Reset</source>
         <translation>Zerar</translation>
     </message>
     <message>
         <source>Start</source>
         <translation>Iniciar</translation>
     </message>
     <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Cronômetro</translation>
-    </message>
-    <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Dormir</translation>
-    </message>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Ajustar Alarme</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarme Ligado</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarme Desligado</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Ajustar data e hora.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Relógio: Alarme perdido.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Alarme ajustado: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -235,53 +195,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Ajustar Alarme</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Hora</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuto</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Atraso para Dormir (minutos)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">alarme mp3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Tudo</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt_BR/datebook.ts b/i18n/pt_BR/datebook.ts
index 2741ce6..02438de 100644
--- a/i18n/pt_BR/datebook.ts
+++ b/i18n/pt_BR/datebook.ts
@@ -334,24 +334,32 @@ longa que o intervalo entre repetições.</translation>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -534,28 +542,24 @@ longa que o intervalo entre repetições.</translation>
         <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 type="obsolete">Horário Inicial</translation>
-    </message>
-    <message>
         <source>Start time</source>
         <translation>Hora Inicial</translation>
     </message>
 </context>
 <context>
     <name>DatebookAlldayDisp</name>
     <message>
         <source>Info</source>
         <translation>Info</translation>
     </message>
 </context>
 <context>
diff --git a/i18n/pt_BR/embeddedkonsole.ts b/i18n/pt_BR/embeddedkonsole.ts
index 9c66596..e8062f9 100644
--- a/i18n/pt_BR/embeddedkonsole.ts
+++ b/i18n/pt_BR/embeddedkonsole.ts
@@ -32,60 +32,40 @@
         <source>New</source>
         <translation>Nova</translation>
     </message>
     <message>
         <source>Tab</source>
         <translation>Aba</translation>
     </message>
     <message>
         <source>Down</source>
         <translation>Abaixo</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">Fonte</translation>
-    </message>
-    <message>
         <source>Enter</source>
         <translation>Entra</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Micro</translation>
-    </message>
-    <message>
         <source>Paste</source>
         <translation>Colar</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Espaço</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">Opções</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Fixa Média</translation>
-    </message>
-    <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Fixa Pequena</translation>
-    </message>
-    <message>
         <source>Show command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Green on Black</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/fifteen.ts b/i18n/pt_BR/fifteen.ts
index d895062..14ce85e 100644
--- a/i18n/pt_BR/fifteen.ts
+++ b/i18n/pt_BR/fifteen.ts
@@ -52,28 +52,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Resolver</translation>
-    </message>
-    <message>
         <source>Randomize</source>
         <translation>Sortear</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Quinze Peças</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/go.ts b/i18n/pt_BR/go.ts
index 109153d..9d4eddf 100644
--- a/i18n/pt_BR/go.ts
+++ b/i18n/pt_BR/go.ts
@@ -17,28 +17,24 @@
     <message>
         <source>Resign</source>
         <translation>Desistir</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
 </context>
 <context>
     <name>GoWidget</name>
     <message>
-        <source>Go</source>
-        <translation type="obsolete">Vai</translation>
-    </message>
-    <message>
         <source>A draw.</source>
         <translation>Um empate</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Eu passo</translation>
     </message>
     <message>
         <source>White %1, Black %2. </source>
         <translation>Preto %1, Branco %2</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/keypebble.ts b/i18n/pt_BR/keypebble.ts
index 75e884a..c9d6de6 100644
--- a/i18n/pt_BR/keypebble.ts
+++ b/i18n/pt_BR/keypebble.ts
@@ -29,28 +29,24 @@ a conexão.</translation>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
         <source>Waiting for desktop name...</source>
         <translation>Esperando pelo nome da área de trabalho...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Conectado a %1</translation>
     </message>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Eperando a inicialização do servidor...</translation>
-    </message>
-    <message>
         <source>Protocol Error: An unknown encoding was used by the server %1</source>
         <translation>Erro de Protocolo: Uma codificação desconhecida foi usada pelo servidor %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Erro de Protocolo: A mensagem Id %1 foi </translation>
     </message>
     <message>
         <source>Waiting for server initialization...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/pt_BR/libbatteryapplet.ts b/i18n/pt_BR/libbatteryapplet.ts
index e6a8337..cb02e9b 100644
--- a/i18n/pt_BR/libbatteryapplet.ts
+++ b/i18n/pt_BR/libbatteryapplet.ts
@@ -6,100 +6,72 @@
         <source>Low</source>
         <translation>Baixo</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Bom</translation>
     </message>
     <message>
         <source>Battery status: </source>
         <translation>Estado da Bateria</translation>
     </message>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Fechar</translation>
-    </message>
-    <message>
         <source>External power disconnected</source>
         <translation>Energia externa desconectada</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Porcentagem de bateria restante</translation>
-    </message>
-    <message>
         <source>Power on-line</source>
         <translation>Energia ligada</translation>
     </message>
     <message>
         <source>On backup power</source>
         <translation>Usando energia de reserva</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Tempo restante de bateria</translation>
-    </message>
-    <message>
         <source>Critical</source>
         <translation>Crítico</translation>
     </message>
     <message>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
         <source>Very Low</source>
         <translation>Muito Baixo</translation>
     </message>
     <message>
         <source>Charging</source>
         <translation>Carregando</translation>
     </message>
     <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Situação da bateria</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Falha</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>não pude abrir arquivo</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Carregando ambos dispositivos</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Porcentagem de bateria restante:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Tempo restante de bateria:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Nenhuma jaqueta com bateria inserida</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>sem dados</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">Ipaq  </translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Jaqueta</translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/libliquid.ts b/i18n/pt_BR/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/pt_BR/libliquid.ts
+++ b/i18n/pt_BR/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/pt_BR/libopiepim2.ts b/i18n/pt_BR/libopiepim2.ts
index 5621229..7a53ff4 100644
--- a/i18n/pt_BR/libopiepim2.ts
+++ b/i18n/pt_BR/libopiepim2.ts
@@ -1,164 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Botão Claendário</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Botão Contatos</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Botão Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Botão Correio</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Botão Início</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Botão Gravar</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotação da Tela</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Inferior+Cima</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Inferior+Baixo</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Inferior+Direita</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Inferior+Esquerda</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Superior+Cima</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Superior+Baixo</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Superior+Direita</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Superior+Esquerda</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Mat:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Verm:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal Alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Selecione a cor</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mais</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mais...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Pequena</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">Evento com Repetição</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">Dia</translation>
@@ -358,256 +208,24 @@ e</translation>
         <translation type="unfinished">mês(es)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">ano(s)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">A cada</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Evento com Repetição</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mês</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">
-A cada:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequência</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Termina Em:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data Final</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repete Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">A cada</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data Final</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dias</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dia</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semanas</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">meses</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mês</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">anos</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">ano</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">e</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-e</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, e</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Sem repetição</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dia(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repete Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semana(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Repete por</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mês(es)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">ano(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">A cada</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">na(o)</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Hora:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Escolha a Hora:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -661,54 +279,24 @@ e</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">DiálogoArquivo</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Salvar</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</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>
@@ -861,36 +449,24 @@ e</translation>
         <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>Documents</source>
-        <translation type="obsolete">Documentos</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Arquivos</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -905,32 +481,24 @@ e</translation>
         <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 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 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>
diff --git a/i18n/pt_BR/libopieui2.ts b/i18n/pt_BR/libopieui2.ts
index 292d2da..43c5e49 100644
--- a/i18n/pt_BR/libopieui2.ts
+++ b/i18n/pt_BR/libopieui2.ts
@@ -1,419 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Botão Claendário</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Botão Contatos</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Botão Menu</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Botão Correio</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Botão Início</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Botão Gravar</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Rotação da Tela</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Inferior+Cima</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Inferior+Baixo</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Inferior+Direita</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Inferior+Esquerda</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Superior+Cima</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Superior+Baixo</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Superior+Direita</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Superior+Esquerda</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Mat:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Sat:</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">Val:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Verm:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Verde:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Azul:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Canal Alfa:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Selecione a cor</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Mais</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Mais...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">DiálogoArquivo</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Abrir</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Salvar</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Nome:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Grande</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Média</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Pequena</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Estilo</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">The Quick Brown Fox Jumps Over The Lazy Dog</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Nome</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Evento com Repetição</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Semana</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mês</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Ano</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">
-A cada:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Frequência</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Termina Em:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data Final</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repete Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">A cada</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Var1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Sem Data Final</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">dias</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">dia</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">semanas</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">semana</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">meses</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">mês</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">anos</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">ano</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">e</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-e</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, e</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Sem repetição</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">dia(s)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Repete Em</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Seg</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Ter</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Qua</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Qui</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Sex</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sab</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Dom</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">semana(s)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Repete por</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dia</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">mês(es)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">ano(s)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">A cada</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -542,289 +137,39 @@ e</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Tamanho</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Data</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Tipo Mime</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Prioridade:</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Progresso:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Prazo:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Categoria:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">E-mail Padrão:</translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Escritório:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Página Web Comercial:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Telefone Comercial:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Fax Comercial:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Celular Comercial:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Pager Comercial:</translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Pagina Web Pessoal:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Telefone Residencial:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Fax Residencial:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Celular Pessoal:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Todos os E-mails:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Profissão:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Assistente:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Gerente:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Masculino</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Feminino</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Sexo:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Conjuge:</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">Aniversário:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Casamento:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Crianças:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Apelido:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Notas:</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Inicio:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Fim:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Nota:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">A cada</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 a cada</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">No(a) %1 de cada</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">A Cada</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Segunda</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Terça</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Quarta</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Quinta</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Sexta</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Sábado</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">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 type="obsolete">Muito Alto</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Alto</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Normal</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Baixo</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Muito Baixo</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Localização:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Este evento dura todo o dia</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">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 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 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 type="obsolete">No(a) %1 de cada </translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Nenhum</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">º</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">º</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">º</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">º</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/pt_BR/libqpe.ts b/i18n/pt_BR/libqpe.ts
index 7dee34b..8b57dd1 100644
--- a/i18n/pt_BR/libqpe.ts
+++ b/i18n/pt_BR/libqpe.ts
@@ -186,28 +186,24 @@ editando as categorias.</translation>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Seqüência não encontrada.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Fim atingido, reiniciando a partir do início</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Localizar</translation>
     </message>
     <message>
@@ -428,30 +424,24 @@ editando as categorias.</translation>
         <source>day</source>
         <translation>dia</translation>
     </message>
     <message>
         <source>year</source>
         <translation>ano</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mês</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Tem certeza que deseja apagar
- %1 ?</translation>
-    </message>
-    <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>Impossível criar arquivos de inicialização
 Por favor, libere algum espaço
 antes de inserir dados</translation>
     </message>
     <message>
         <source>Out of Space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
@@ -466,32 +456,24 @@ Configuration Information
 for this program.
 
 Please free up some space and
 try again.</source>
         <translation>Houve um problema criando
 Informações de Configuração 
 para este programa.
 
 Por favor, libere algum espaço e
 tente novamente.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Tudo</translation>
     </message>
     <message>
@@ -782,44 +764,24 @@ tente novamente.</translation>
         <source>Fri</source>
         <translation>Sex</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sab</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Dom</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Clique para fechar esta janela descartando as mudanças.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Clique para fechar esta janela.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Clique para fechar esta janela e salvar as mudanças.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Clique para tornar esta janela móvel.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Marque para que esta janela ocupe toda a área da tela.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Ajuda completa não está disponível para esta aplicação, porém existe ajuda sensível ao contexto.&lt;p&gt;Para usar a ajuda sensível ao contexto:&lt;p&gt;&lt;ol&gt;&lt;li&gt;clique e segure no botão de ajuda.&lt;li&gt;quando a barra de título mostrar &lt;b&gt;O que é isto...&lt;/b&gt;, clique em qualquer controle.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>O que é isso...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Tem certeza que você deseja apagar
 %1?&lt;/qt&gt;</translation>
@@ -864,40 +826,24 @@ tente novamente.</translation>
         <source>Oct</source>
         <translation>Out</translation>
     </message>
     <message>
         <source>Nov</source>
         <translation>Nov</translation>
     </message>
     <message>
         <source>Dec</source>
         <translation>Dez</translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Erro</translation>
-    </message>
-    <message>
-        <source>Could not find the application </source>
-        <translation type="obsolete">Impossível localizar a aplicação</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">OK</translation>
-    </message>
-    <message>
-        <source>Could not start the application </source>
-        <translation type="obsolete">Impossível iniciar a aplicação</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">D</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/pt_BR/libwlan.ts b/i18n/pt_BR/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/pt_BR/libwlan.ts
+++ b/i18n/pt_BR/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/pt_BR/mindbreaker.ts b/i18n/pt_BR/mindbreaker.ts
index a7bb1a3..cd80c28 100644
--- a/i18n/pt_BR/mindbreaker.ts
+++ b/i18n/pt_BR/mindbreaker.ts
@@ -21,29 +21,17 @@
         <source>OK</source>
         <translation>OK</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Zera o contador de vitórias ?</translation>
     </message>
     <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Resposta %1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Zerar Estatísticas</translation>
     </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">Atual%1</translation>
-    </message>
-    <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Ir%1p%2</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/minesweep.ts b/i18n/pt_BR/minesweep.ts
index c878839..3e89e8e 100644
--- a/i18n/pt_BR/minesweep.ts
+++ b/i18n/pt_BR/minesweep.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>MineSweep</name>
     <message>
         <source>Game</source>
         <translation>Jogo</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Caça Minas</translation>
-    </message>
-    <message>
         <source>Expert</source>
         <translation>Expert</translation>
     </message>
     <message>
         <source>You won!</source>
         <translation>Você Venceu !</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Você Explodiu !</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/opie-eye.ts b/i18n/pt_BR/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/pt_BR/opie-eye.ts
+++ b/i18n/pt_BR/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/opiemail.ts b/i18n/pt_BR/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/pt_BR/opiemail.ts
+++ b/i18n/pt_BR/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/pt_BR/patience.ts b/i18n/pt_BR/patience.ts
index 73ccab5..9b31be6 100644
--- a/i18n/pt_BR/patience.ts
+++ b/i18n/pt_BR/patience.ts
@@ -10,64 +10,40 @@
         <source>&amp;Game</source>
         <translation>&amp;Jogo</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;Sobre</translation>
     </message>
     <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">A&amp;trair para Posição</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Atrair para Posição</translation>
-    </message>
-    <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Virar Três Cartas</translation>
-    </message>
-    <message>
         <source>Patience</source>
         <translation>Paciência</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Mudar Verso das Cartas</translation>
-    </message>
-    <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Mudar verso das Cartas</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Virar Uma Carta</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Harp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/qpe.ts b/i18n/pt_BR/qpe.ts
index 3f9f15f..5255d42 100644
--- a/i18n/pt_BR/qpe.ts
+++ b/i18n/pt_BR/qpe.ts
@@ -394,33 +394,21 @@ immediately.</source>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Contatos&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Cancelar</translation>
-    </message>
-    <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Sincronizando</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/security.ts b/i18n/pt_BR/security.ts
index 743238f..76fd073 100644
--- a/i18n/pt_BR/security.ts
+++ b/i18n/pt_BR/security.ts
@@ -158,100 +158,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Qualquer</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Mudar senha</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Senha incorreta</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Entre a senha</translation>
-    </message>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Ajustar senha</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">A senha inserida está incorreta.
-Acesso negado</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Qualquer</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Nenhum</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Sincronizar</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Mudar a senha</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Aceitar sincronização da rede:</translation>
-    </message>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Ajustes</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Limpar a senha</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">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="obsolete">&lt;P&gt;A senha provê um nível mínimo de segurança quantra o acesso casual a este dispositivo.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (padrão)</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sincronizar</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Aceitar sincronização da rede:</translation>
diff --git a/i18n/pt_BR/snake.ts b/i18n/pt_BR/snake.ts
index 83be402..8ff2b47 100644
--- a/i18n/pt_BR/snake.ts
+++ b/i18n/pt_BR/snake.ts
@@ -2,51 +2,43 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>SnakeGame</name>
     <message>
         <source>Snake</source>
         <translation>Cobra</translation>
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>COBRA !</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Pressione Qualquer Tecla Para Começar um Novo Jogo</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>     Pontos :    %1   </translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Use as teclas de cursor para guiar a
 cobra para que coma os ratos. Você não deve
 bater nas paredes, cantos ou na própria cauda.</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FIM DE JOGO !
  Seus Pontos:  %1</translation>
     </message>
     <message>
         <source>New Game</source>
         <translation>Novo Jogo</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Pressione Qualquer Tecla Para Começar</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/pt_BR/today.ts b/i18n/pt_BR/today.ts
index 2c79be2..f6aa077 100644
--- a/i18n/pt_BR/today.ts
+++ b/i18n/pt_BR/today.ts
@@ -2,28 +2,24 @@
 <defaultcodec>iso8859-1</defaultcodec>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation type="unfinished">Hoje</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Por favor preencha seu cartão de visita</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">Nenhum Plugin encontrado</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>Nenhum plugin ativado</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>Owned by </source>
         <translation>Pertence a</translation>
     </message>
     <message>
diff --git a/i18n/pt_BR/todolist.ts b/i18n/pt_BR/todolist.ts
index d2486cc..99256b6 100644
--- a/i18n/pt_BR/todolist.ts
+++ b/i18n/pt_BR/todolist.ts
@@ -77,206 +77,118 @@
     <message>
         <source>Edit Task</source>
         <translation>Editar Tarefa</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>silencioso</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>alto</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Lista de Tarefas</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Novo apartir do modelo</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Nova Tarefa</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Clique aqui para criar nova tarefa.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Editar Tarefa</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Clique aqui para alterar a recursão da tarefa.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Ver Tarefa</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Apagar...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Clique aqui para remover a tarefa atual.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Apagar tudo...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Remoção completada</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Enviar</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Clique aqui para enviar a tarefa atual para outro dispositivo.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Localizar</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Mostrar tarefas completadas</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Mostrar apenas tarefas atrasadas</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Mostrar prazos das tarefas</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Mostrar barra de tarefas rápida</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Dados</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Categoria</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Opções</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>Editção Rápida</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Esta é uma lista de todas as tarefas atuais.
 
 A lista mostra as seguintes informações:
 1. Completa - Uma marca de checagem verde indica tarefa completa.  Clique aqui para completar uma tarefa.
 2. Prioridade - uma representação gráfica da prioridade da tarefa. Duplo-clique aqui para modificar.
 3. Descrição - Descrição da tarefa.  Clique aqui para selecionar a tarefa.
 4. Prazo - mostra quando a tarefa deve estar terminada.  Esta coluna pode ser mostrada ou ocultada selecionando-se Opções-&gt;&apos;Mostrar prazos das tarefas&apos; no menu acima.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Todas as Categorias</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Sem Espaço</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Tarefas não pode
 salvar suas mudanças.
 Libere algum espaço
 e tente novamente.
 
 Sair assim mesmo ?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation>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 type="obsolete">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 type="obsolete">Duplicar</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>C.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Prioridade</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Descrição</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Prazo</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
diff --git a/i18n/pt_BR/zsafe.ts b/i18n/pt_BR/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/pt_BR/zsafe.ts
+++ b/i18n/pt_BR/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/ru/addressbook.ts b/i18n/ru/addressbook.ts
index 54792b4..ed167da 100644
--- a/i18n/ru/addressbook.ts
+++ b/i18n/ru/addressbook.ts
@@ -19,88 +19,24 @@
     <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Контакты</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Контакт</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">Список</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Карта</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Новый</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Редактировать</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Удалить</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Поиск</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Начать поиск</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Закрыть</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Написать письмо</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Отправить</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Импорт vCard</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Сведения обо мне</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Записать все</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Конфигурация</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Просмотр</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Тип файла правильный?</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>Выбранный файл
 не имеет расширения &quot;.vcf&quot;.
 Вы действительно хотите открыть его?</translation>
     </message>
     <message>
@@ -121,28 +57,24 @@
         <translation>Вы действительно хотите добавить контакт для
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>Да для всех</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Не могу редактировать, синхронизируюсь</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Редактировать адрес</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>Редактировать сведения обо мне</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>Контакты - Сведения обо мне</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Нет места</translation>
     </message>
     <message>
@@ -156,40 +88,28 @@ Quit anyway?</source>
 и попробуйте снова.
 Все равно выйти? </translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>Не найдено</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>Не могу найти контакт для заданных условий поиска!</translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation type="obsolete">Карточки</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Без категории</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Экспорт vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Вы выбрали контакт!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Вы должны задать имя файла !</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation>Правка контакта</translation>
     </message>
 </context>
@@ -1382,180 +1302,13 @@ Opie-Mail - свободная программа!</translation>
         <source>Export vCard</source>
         <translation>Экспорт vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation>Сведения обо мне</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation>Показать панель поиска</translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Раб. тел.</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Раб. факс</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Раб. моб.</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">E-mail по умолчанию</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">E-Mail</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Дом. тел.</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Дом. факс</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Дом. моб.</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Офис</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Профессия</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Помощник</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Управляющий</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Супруг(а)</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Пол</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">День рожд.</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Годовщина</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Прозвище</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Дети</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Name Title</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Отчество</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Фамилия</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Суффикс</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Файл</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Должность</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Отдел</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Компания</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Раб. улица</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Раб. город</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Раб. область</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Раб. индекс</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Страна(раб.)</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Раб. пейджер</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Раб. WEB-страница</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Дом. ул.</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Дом. город</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Дом.обл.</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Дом.индекс</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Страна(дом)</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Дом.WEB</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Заметки</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/ru/advancedfm.ts b/i18n/ru/advancedfm.ts
index f4acec2..ab02bf7 100644
--- a/i18n/ru/advancedfm.ts
+++ b/i18n/ru/advancedfm.ts
@@ -29,32 +29,24 @@
         <source>Run Command</source>
         <translation>Выполнить команду</translation>
     </message>
     <message>
         <source>Run Command with Output</source>
         <translation>Выполнить команду, с выводом</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <source>Switch to Local</source>
-        <translation type="obsolete">Перекл. на местную</translation>
-    </message>
-    <message>
-        <source>Switch to Remote</source>
-        <translation type="obsolete">Перекл. на удаленную</translation>
-    </message>
-    <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
         <source>1</source>
         <translation>1</translation>
     </message>
     <message>
@@ -69,28 +61,24 @@
         <source>No</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Заметка</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Не могу переименовать</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Каталог не существует</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Копировать как</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>AdvancedFm вывод</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Advancedfm Отправка</translation>
     </message>
     <message>
@@ -137,175 +125,84 @@
         <source>Properties</source>
         <translation>Свойства</translation>
     </message>
     <message>
         <source>Beam File</source>
         <translation>Отправить файл</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Копировать эту же директ.</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Не могу скопировать
-</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">в</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Не могу переместить
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Добавить в Документы</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>Действия</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Выбрать все</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Действительно удалить
-%1 файлы?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Удалить каталог?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Действительно скопировать
-%1 файлы?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Файл существует!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-существует. Перезаписать?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">уже существует.
-Вы действительно хотите удалить?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 существует. Перезаписать?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Не могу скопировать %1 в %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-Копирайт 2002-2003
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-лицензирован на условиях GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Добавить в закладки</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>Убрать каталог из закладок</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">Не могу убрать каталог
-из закладок.
-Он не заложен!
-
-</translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation>Поиск файла</translation>
     </message>
     <message>
-        <source>Really delete %1
-and all it&apos;s contents ?</source>
-        <translation type="obsolete">Действительно удалить %1
-и все содержимые ?</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">Действительно удалить
-%1?</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>Копировать</translation>
     </message>
     <message>
         <source> As</source>
         <translation>Как</translation>
     </message>
     <message>
         <source>AdvancedFm :: </source>
         <translation>ФайлМенеджер :: </translation>
     </message>
     <message>
         <source> kB free</source>
         <translation>кбайт свободно</translation>
     </message>
     <message>
         <source>Switch to View 1</source>
         <translation>Перекл. на Вид 1</translation>
     </message>
     <message>
         <source>Switch to View 2</source>
         <translation>Перекл. на Вид 2</translation>
     </message>
     <message>
-        <source>Could not copy 
-%1 
-to 
-%2</source>
-        <translation type="obsolete">Не могу скопировать 
-%1 
-в 
-%2</translation>
-    </message>
-    <message>
         <source>Not Yet Implemented</source>
         <translation>Еще не сделано</translation>
     </message>
     <message>
         <source>&lt;p&gt;%1 does not exist&lt;/p&gt;</source>
         <translation>&lt;p&gt;%1 не существует&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;P&gt;Advanced FileManager is copyright 2002-2003 by L.J.Potter&lt;llornkcor@handhelds.org&gt; and is licensed by the GPL&lt;/P&gt;</source>
         <translation>&lt;P&gt;Advanced FileManager копирайт 2002-2003 L.J.Potter&lt;llornkcor@handhelds.org&gt;. Лицензирован на условиях GPL.&lt;/P&gt;</translation>
     </message>
     <message>
diff --git a/i18n/ru/appearance.ts b/i18n/ru/appearance.ts
index b70afe2..568127e 100644
--- a/i18n/ru/appearance.ts
+++ b/i18n/ru/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Редакт.</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Записать</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Применять стиль для всех программ.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Запретить стиль для программ (&lt;b&gt;*&lt;/b&gt; может использоваться как шаблон):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Исп. файл(ы)</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>Стиль вкладок:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>Вкладки</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>Вкладки / Иконки</translation>
     </message>
     <message>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Перегрузить</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Вы хотите перезагрузить %1?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Да</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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>Конфигурируем выбранный стиль.
@@ -161,52 +129,24 @@ Click here to select an available scheme.</source>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Щелкните для изменения цветов в текущей схеме.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Щелкните для удаления выбранной цветовой схемы.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Щелкните, чтобы сохранить текущую схему.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Щелкните, чтобы разрешить всем программам использовать глобальные установки.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Если глобальные установки не действуют на некоторые программы, возможно, они запрещены для этих программ.
-
-Выберите программу, для которых Вы хотите запретить глобальные установки.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Щелкните, чтобы добавить программу из списка.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Щелкните, чтобы удалить выбранную программу.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Щелкните для перемещения вверх по списку.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Щелкните для перемещения вниз по списку.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Щелкните для выбора желаемого стиля диалога со вкладками ( как эта программа). Доступные стили:
 
 1) Вкладки - обычные вкладки с текстом.
 2) Вкладки/Иконки - иконка на каждой вкладке, надпись на текущей.
 3) Список - вертикальный список вкладок.
 3) Список/Иконки - вертикальный список с иконками.</translation>
diff --git a/i18n/ru/aqpkg.ts b/i18n/ru/aqpkg.ts
index 2a0cc26..a68200b 100644
--- a/i18n/ru/aqpkg.ts
+++ b/i18n/ru/aqpkg.ts
@@ -198,56 +198,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>Не могу открыть файл статуса - </translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>Не могу создать временный файл статуса - </translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>Не могу запустить процесс ipkg</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">Не могу открыть :</translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">Создаю каталог</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">Привязал %1 к %2</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">Не смог привязать %1 к %2</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">Убрал %1</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">Не смог убрать %1</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">Убран</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">Не смог убрать</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation>Не могу запустить ipkg-link</translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation>Не могу создать ссылки!
 </translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
diff --git a/i18n/ru/backup.ts b/i18n/ru/backup.ts
index 9563810..feba4a8 100644
--- a/i18n/ru/backup.ts
+++ b/i18n/ru/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Резервное копирование... в процессе...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Архивация и восстановление</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>Ошибка системы:</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
@@ -26,44 +22,36 @@
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>Детали</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>Архивация и восстановление.. Сбой !!</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">Сохранили успешно.</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>Выберите что-нибудь для восстановления.</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>Восстановить не удалось.</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>Не могу открыть файл: %1</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">Восстановили успешно.</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation>Архивация прошла успешно.</translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation>Восстановили успешно.</translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation>Архивирую...</translation>
     </message>
     <message>
@@ -97,87 +85,59 @@
         <source>Backup And Restore</source>
         <translation>Резервное копирование</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Архивировать</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Приложения</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Записать на</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Сохранить</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Восстановить</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Выберите источник</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>Столбец 1</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>&amp;Восстановить</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">Обновить список</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation>Местоположения</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation type="obsolete">...</translation>
-    </message>
-    <message>
         <source>Destination</source>
         <translation>Место назначения</translation>
     </message>
-    <message>
-        <source>Type</source>
-        <translation type="obsolete">Тип</translation>
-    </message>
-    <message>
-        <source>User Data (Configuration + PIM)</source>
-        <translation type="obsolete">Данные пользователя (конфигурация + PIM)</translation>
-    </message>
-    <message>
-        <source>Full Backup (Root File System)</source>
-        <translation type="obsolete">Полный архив (корневая файловая система)</translation>
-    </message>
 </context>
 <context>
     <name>ErrorDialog</name>
     <message>
         <source>Error Info</source>
         <translation>Информация об ошибке</translation>
     </message>
     <message>
         <source>Error Message:</source>
         <translation>Сообщение об ошибке:</translation>
     </message>
     <message>
diff --git a/i18n/ru/bartender.ts b/i18n/ru/bartender.ts
index 1ecb6ae..2cde02e 100644
--- a/i18n/ru/bartender.ts
+++ b/i18n/ru/bartender.ts
@@ -80,36 +80,28 @@
         <source>New Drink</source>
         <translation>Новый напиток</translation>
     </message>
     <message>
         <source>Open Drink</source>
         <translation>Открыть напиток</translation>
     </message>
     <message>
         <source>Find by Drink Name</source>
         <translation>Искать по имени напитка</translation>
     </message>
     <message>
-        <source>Find by Alcohol</source>
-        <translation type="obsolete">Искать по уровню алкоголя</translation>
-    </message>
-    <message>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <source>edit</source>
-        <translation type="obsolete">правка</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Создать</translation>
     </message>
     <message>
         <source>Open</source>
         <translation>Открыть</translation>
     </message>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
@@ -128,28 +120,24 @@
     </message>
     <message>
         <source>Search by drink name
 </source>
         <translation>Искать по имени напитка
 </translation>
     </message>
     <message>
         <source>Drink Name</source>
         <translation>Имя напитка</translation>
     </message>
     <message>
-        <source>Alcohol</source>
-        <translation type="obsolete">Уровень алкоголя</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>Искать</translation>
     </message>
     <message>
         <source>Sorry no results for
 </source>
         <translation>Извините, ничего не найдено по
 </translation>
     </message>
     <message>
         <source>Find by Ingredient</source>
         <translation>Искать по ингредиентам</translation>
diff --git a/i18n/ru/calculator.ts b/i18n/ru/calculator.ts
index 0897e2d..f257427 100644
--- a/i18n/ru/calculator.ts
+++ b/i18n/ru/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Экспериментальный калькулятор</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation>Калькулятор</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <translation type="obsolete">Калькулятор</translation>
-    </message>
-    <message>
         <source>Standard</source>
         <translation>Стандартный</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Standard</source>
         <translation>Стандартный</translation>
     </message>
     <message>
         <source>Weight</source>
diff --git a/i18n/ru/calibrate.ts b/i18n/ru/calibrate.ts
index 2b0bc08..c2a4bdb 100644
--- a/i18n/ru/calibrate.ts
+++ b/i18n/ru/calibrate.ts
@@ -1,15 +1,11 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Нажмите на цели твердо и аккуратно
 чтобы откалибровать ваш экран.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добро пожаловать в Opie</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/ru/clock.ts b/i18n/ru/clock.ts
index 9790d31..87e119d 100644
--- a/i18n/ru/clock.ts
+++ b/i18n/ru/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation>мин</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Вздремнуть</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Часы</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Секундомер</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Старт</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Сброс</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Уст. сигнал</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Стоп</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Сигнал включен</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Сигнал выключен</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Уст. время и дату.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Часы: Сигнал пропущен.</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">Сигнал уст.: %1</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation>Пнд</translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation>Втр</translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -235,54 +195,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation>Обратный отсчет</translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation>Воспроизвести звук</translation>
     </message>
     <message>
         <source>Play File</source>
         <translation>Воспроизвести файл</translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Уст. сигнал</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Час</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Минута</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Задержка дремоты :)
-(минут)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 сигнал</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Все</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Аудио</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/ru/datebook.ts b/i18n/ru/datebook.ts
index 7b27103..bbea83d 100644
--- a/i18n/ru/datebook.ts
+++ b/i18n/ru/datebook.ts
@@ -333,24 +333,32 @@ Quit anyway?</source>
     <message>
         <source>Office</source>
         <translation>Офис</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Дома</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Категория:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/ru/doctab.ts b/i18n/ru/doctab.ts
index 5bce85d..79027ad 100644
--- a/i18n/ru/doctab.ts
+++ b/i18n/ru/doctab.ts
@@ -1,30 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>DocTabSettingsBase</name>
     <message>
         <source>DocTab Settings</source>
         <translation>Настройки ДокВкладки</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="obsolete">&lt;b&gt;Вы хотите иметь вкладку Документы?&lt;/b&gt;&lt;p&gt;
-(Заметьте что для этого требуется сканировать
-&lt;i&gt;все&lt;/i&gt; документы на &lt;i&gt;всех&lt;/i&gt; внешних устройствах,
-что может быть очень медленно и надоедливо...)</translation>
-    </message>
-    <message>
         <source>Enable the DocTab</source>
         <translation>Разрешить ДокВкладку</translation>
     </message>
     <message>
         <source>Yes, please!</source>
         <translation>Да, пожалуйста!</translation>
     </message>
     <message>
         <source>No, thanks.</source>
         <translation>Нет, спасибо.</translation>
     </message>
     <message>
diff --git a/i18n/ru/embeddedkonsole.ts b/i18n/ru/embeddedkonsole.ts
index 533eea5..adbea12 100644
--- a/i18n/ru/embeddedkonsole.ts
+++ b/i18n/ru/embeddedkonsole.ts
@@ -19,44 +19,24 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Предложенные команды&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Терминал</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Микро</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Мелкий Fixed</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Средний Fixed</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">Шрифт</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Новый</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Ввод</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Пробел</translation>
     </message>
     <message>
@@ -75,52 +55,36 @@
         <source>Paste</source>
         <translation>Вставить</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Показать список команд</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Скрыть список команд</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Вкладки снизу</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Зеленый на черном</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Черный на белом</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Белый на черном</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Черный на прозрачном</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Черный на красном</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Красный на черном</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Зеленый на желтом</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Синий на малиновом</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Малиновый на синем</translation>
     </message>
     <message>
@@ -139,28 +103,24 @@
         <source>Amber on Black</source>
         <translation>Янтарный на черном</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Быстрая правка</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Изменить</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Слева</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Справа</translation>
     </message>
     <message>
@@ -183,28 +143,24 @@
         <source>Command List</source>
         <translation>Список команд</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Перенос</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Использовать сигнал</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Вкладки сверху</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation>Консоль</translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation>Снизу</translation>
     </message>
     <message>
         <source>Top</source>
         <translation>Сверху</translation>
     </message>
     <message>
diff --git a/i18n/ru/fifteen.ts b/i18n/ru/fifteen.ts
index c447d34..f753f8d 100644
--- a/i18n/ru/fifteen.ts
+++ b/i18n/ru/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Столбцы:&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Перемешать</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Решение</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Игра</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Пятнашки</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation>Настроить</translation>
     </message>
 </context>
diff --git a/i18n/ru/go.ts b/i18n/ru/go.ts
index 773c666..302a554 100644
--- a/i18n/ru/go.ts
+++ b/i18n/ru/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Ничья.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Передаю ход</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Плененных: черных %1, белых %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Го</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/ru/gutenbrowser.ts b/i18n/ru/gutenbrowser.ts
index ddf1fbf..bceb004 100644
--- a/i18n/ru/gutenbrowser.ts
+++ b/i18n/ru/gutenbrowser.ts
@@ -23,28 +23,24 @@
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
         <translation>А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
     </message>
 </context>
 <context>
     <name>Gutenbrowser</name>
     <message>
-        <source>Gutenbrowser Output</source>
-        <translation type="obsolete">Вывод Гутенбраузера</translation>
-    </message>
-    <message>
         <source>Running wget</source>
         <translation>Запускаю wget</translation>
     </message>
     <message>
         <source>Download Library Index, or FTP sites?</source>
         <translation>Скачать библиотечный индекс или FTP сайтов?</translation>
     </message>
     <message>
         <source>Do you want to download the newest
 Project Gutenberg Library Index?
 or select an ftp site?
 </source>
@@ -235,28 +231,24 @@ http://www.trolltech.com
     <message>
         <source>Home</source>
         <translation>Домой</translation>
     </message>
 </context>
 <context>
     <name>LibraryDialog</name>
     <message>
         <source>Library Index - using master pg index.</source>
         <translation>Библиотечный индекс - используется главный индекс проекта.</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Error opening local library index:&lt;/P&gt; </source>
-        <translation type="obsolete">&lt;p&gt;Не могу открыть локальный библиотечный индекс:&lt;/p&gt; </translation>
-    </message>
-    <message>
         <source>Library Search</source>
         <translation>Поиск по библиотеке</translation>
     </message>
     <message>
         <source>Downloading Gutenberg Index....</source>
         <translation>Скачиваю Гутенберг индекс...</translation>
     </message>
     <message>
         <source>Running wget</source>
         <translation>Запускаю wget</translation>
     </message>
     <message>
@@ -284,25 +276,25 @@ http://www.trolltech.com
         <translation>G-M</translation>
     </message>
     <message>
         <source>N-R</source>
         <translation>N-R</translation>
     </message>
     <message>
         <source>S-Z</source>
         <translation>S-Z</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Options</source>
         <translation>Настройки</translation>
     </message>
     <message>
         <source>Open Automatically</source>
         <translation>Открывать автоматически</translation>
     </message>
     <message>
         <source>Last name first 
 (requires library restart)</source>
@@ -312,24 +304,28 @@ http://www.trolltech.com
     <message>
         <source>Search</source>
         <translation>Искать</translation>
     </message>
     <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
         <source>&lt;p&gt;Error opening library index file. Please download a new one.&lt;/P&gt; </source>
         <translation>&lt;p&gt;Ошибка открытия файла индекса библиотеки. Пожалуйста скачайте новый.&lt;/P&gt; </translation>
     </message>
+    <message>
+        <source>   </source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkDialog</name>
     <message>
         <source>FTP Download</source>
         <translation>Закачка по FTP</translation>
     </message>
     <message>
         <source>Download should start shortly</source>
         <translation>Загрузка скоро должна начаться</translation>
     </message>
     <message>
diff --git a/i18n/ru/kbill.ts b/i18n/ru/kbill.ts
index 3ef9b49..63290c3 100644
--- a/i18n/ru/kbill.ts
+++ b/i18n/ru/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Файл</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;История&lt;/b&gt;&lt;p&gt;И снова судьба мира в ваших руках!  Злобный кракер, известный только по его кличке &apos;Билл&apos;, создал идеальный компьютерный вирус.  Вирус, который может запросто превратить обычный компьютер в тостер.  (ооо!) &apos;Билл&apos; склонировал себя в миллион-зиллион микро-Биллов.  Их единственная цель - занести этот мерзкий вирус, который был искусно замаскирован под популярную операционную системы. Ваша задача как Системного Администратора и Истребителя - предотвратить Билла от успешного завершения его черного дела.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>История КБилла</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Правила игры КБилла</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;Правила Игры&lt;/b&gt;&lt;p&gt;кБилл был усердно разработан и продуман, чтобы играть в него было также просто для всей семьи, как и для маленькой Салли. Года - не - дни бета-тестинга и консультации с самыми дешевыми разработчиками интерфейса вылились в игру, которая легко используема, в тоже время в которой ничего нет, прямо как в Макинтоше.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Давите Биллов (щелчками)&lt;/LI&gt;&lt;LI&gt;Перезагружайте компьютеры (щелчками)&lt;/LI&gt;&lt;LI&gt;Подбирайте утащенные ОСи и возвращайте (перетаскивая) их на место&lt;/LI&gt;&lt;LI&gt;Перетаскивайте ведро чтобы тушить искры&lt;/LI&gt;&lt;LI&gt;Сбор очков основан на общем времени работы систем, с бонусами за убиение Биллов.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Во всем остальном разбирайтесь сами.  Мы смогли, так что это не так уж сложно</translation>
     </message>
     <message>
diff --git a/i18n/ru/keypebble.ts b/i18n/ru/keypebble.ts
index 6649a3a..7dc1b6b 100644
--- a/i18n/ru/keypebble.ts
+++ b/i18n/ru/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>Ошибка чтения: QSocket сообщил об ошибке
 во время чтения данных, возможно что удаленный
 хост отменил соединение.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket сообщил неверный код ошибки</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Ожидаю инициализации сервера...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Ожидаю имя рабочего стола...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Подключен к %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Ошибка протокола: ID сообщения %1 получено в то время как ожидалось сообщение обновления.</translation>
     </message>
     <message>
diff --git a/i18n/ru/kpacman.ts b/i18n/ru/kpacman.ts
index 6c0b7b0..79b211f 100644
--- a/i18n/ru/kpacman.ts
+++ b/i18n/ru/kpacman.ts
@@ -214,25 +214,29 @@ or is of an unknown format.</source>
         <translation>ПОЗ   ОЧКИ  ИМЯ   ДАТА</translation>
     </message>
     <message>
         <source>PAUSED</source>
         <translation>ПАУЗА</translation>
     </message>
     <message>
         <source>@YY@/@MM@/@DD@</source>
         <translation>@ГГ@/@ММ@/@ДД@</translation>
     </message>
     <message>
         <source></source>
-        <translation></translation>
+        <translation type="unfinished"></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>Не могу создать изображение.
 
 Файл &apos;@PIXMAPNAME@&apos; не существует или
diff --git a/i18n/ru/launchersettings.ts b/i18n/ru/launchersettings.ts
index 93c4841..064e939 100644
--- a/i18n/ru/launchersettings.ts
+++ b/i18n/ru/launchersettings.ts
@@ -78,28 +78,24 @@
         <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="obsolete">Показывать приложения в суб-окнах</translation>
-    </message>
-    <message>
         <source>Show Applications in Subpopups</source>
         <translation>Показывать приложения в под-окнах</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>Sample 1</source>
         <translation>Пример 1</translation>
     </message>
     <message>
         <source>Sample 2</source>
@@ -207,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/ru/libaboutapplet.ts b/i18n/ru/libaboutapplet.ts
index 5860e5b..42cb323 100644
--- a/i18n/ru/libaboutapplet.ts
+++ b/i18n/ru/libaboutapplet.ts
@@ -2,232 +2,54 @@
 <context>
     <name>AboutApplet</name>
     <message>
         <source>About shortcut</source>
         <translation>Ссылка &quot;О программе&quot;</translation>
     </message>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
 </context>
 <context>
-    <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">О программе</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.2&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
-&lt;/p&gt;
-&lt;p&gt;
-Не существует ни одной группы, компании или организации, контролирующей разработку Opie. Любой человек может участвовать в процессе.
-&lt;/p&gt;
-&lt;p&gt;
-Зайдите на &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org&lt;/a&gt; чтобы получить дальнейшую информацию о проекте Opie.
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Authors</source>
-        <translation type="obsolete">Авторы</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Report</source>
-        <translation type="obsolete">Сообщить</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Программное обеспечение всегда можно улучшить, и команда Opie готова это сделать. Но вы - пользователь - должны нам сообщить когда программы не работают так, как они должны, или могли бы работать лучше.&lt;/p&gt;
-&lt;p&gt;У Open Palmtop Integrated Environment есть система отслеживания багов. Зайдите на
-&lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; чтобы сообщить об ошибках.&lt;/p&gt;
-&lt;p&gt;Если у вас есть свои предложения, вы можете использовать эту же систему. Пожалуйста убедитесь что вы отметили уровень серьезности &quot;Feature Wish&quot;(&quot;Пожелание&quot;).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Join</source>
-        <translation type="obsolete">Присоединяйтесь</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Вам не нужно быть разработчиком программного обеспечения чтобы стать членом команды Opie. Вы можете присоединиться к интернациональным командам которые переводят интерфейс программ. Вы можете предоставлять графику, темы, звуки, или улучшенную документацию. Выбирайте сами!&lt;/p&gt;
-&lt;p&gt;Зайдите на &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; чтобы узнать про проекты в которых вы можете участвовать.&lt;/p&gt;
-&lt;p&gt;Если вам нужно больше информации или документации, &lt;a href=&quot;http://opie.handhelds.org/&quot;&gt;http://opie.handhelds.org/&lt;/a&gt; даст вам все, что необходимо.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.3&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
-&lt;/p&gt;
-&lt;p&gt;
-No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
-&lt;/p&gt;
-&lt;p&gt;
-Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
-&lt;/p&gt;
-&lt;p&gt;
-Не существует ни одной группы, компании или организации, контролирующей разработку Opie. Любой человек может участвовать в процессе.
-&lt;/p&gt;
-&lt;p&gt;
-Зайдите на &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; чтобы получить дальнейшую информацию о проекте Opie.
-&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
-&lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
-&lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Программное обеспечение всегда можно улучшить, и команда Opie готова это сделать. Но вы - пользователь - должны сообщить нам когда программы не работают так, как они должны, или могли бы работать лучше.&lt;/p&gt;
-&lt;p&gt;У Open Palmtop Integrated Environment есть система отслеживания багов. Зайдите на &lt;i&gt;http://opie.han0dhelds.org/&lt;/i&gt; чтобы сообщить об ошибках.&lt;/p&gt;
-&lt;p&gt;Если у вас есть свои предложения, вы можете использовать эту же систему. Пожалуйста убедитесь что вы отметили уровень серьезности &quot;Feature Wish&quot;(&quot;Пожелание&quot;).&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You don&apos;t have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!&lt;/p&gt;
-&lt;p&gt;Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; for information on some projects in which you can participate.&lt;/p&gt;
-&lt;p&gt;If you need more information or documentation, then a visit to &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; will provide you with what you need.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Вам не нужно быть разработчиком программного обеспечения чтобы стать членом команды Opie. Вы можете присоединиться к интернациональным командам которые переводят интерфейс программ. Вы можете предоставлять графику, темы, звуки, или улучшенную документацию. Выбирайте сами!&lt;/p&gt;
-&lt;p&gt;Зайдите на &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; чтобы узнать про проекты в которых вы можете участвовать.&lt;/p&gt;
-&lt;p&gt;Если вам нужно больше информации или документации, &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; даст вам все, что необходимо.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.6&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>AboutWidget</name>
     <message>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <source>&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</source>
-        <translation type="obsolete">&lt;center&gt;&lt;b&gt;The Open Palmtop Integrated Environment V1.1.8&lt;/b&gt;&lt;/center&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;
 The &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; is written and maintained by the Opie Team, a world-wide network of software engineers committed to free software development.
 &lt;/p&gt;
 &lt;p&gt;
 No single group, company or organization controls the Opie source code. Everyone is welcome to contribute to Opie.
 &lt;/p&gt;
 &lt;p&gt;
 Visit &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; for more information on the Opie Project.
 &lt;/p&gt;</source>
         <translation>&lt;p&gt;
 &lt;b&gt;Open Palmtop Integrated Environment&lt;/b&gt; написан и поддерживается командой Opie, всемирной сетью разработчиков, преданных созданию свободного программного обеспечения.
 &lt;/p&gt;
 &lt;p&gt;
 Не существует ни одной группы, компании или организации, контролирующей разработку Opie. Любой человек может участвовать в процессе.
 &lt;/p&gt;
 &lt;p&gt;
 Зайдите на &lt;i&gt;http://opie.handhelds.org&lt;/i&gt; чтобы получить дальнейшую информацию о проекте Opie.
 &lt;/p&gt;</translation>
     </message>
     <message>
         <source>Authors</source>
         <translation>Авторы</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;
-&lt;b&gt;Rajko &apos;alwin&apos; Albrecht&lt;/b&gt; (alwin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Stefan &apos;eilers&apos; Eilers&lt;/b&gt; (eilers@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Holger &apos;Zecke&apos; Freyther&lt;/b&gt; (zecke@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Chris &apos;Kergoth&apos; Larson&lt;/b&gt; (kergoth@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Michael &apos;Mickey&apos; Lauer&lt;/b&gt; (mickeyl@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Lorn &apos;ljp&apos; Potter&lt;/b&gt; (ljp@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Max &apos;Harlekin&apos; Reiss&lt;/b&gt; (harlekin@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Andreas &apos;ar&apos; Richter&lt;/b&gt; (ar@handhelds.org)&lt;br/&gt;
-&lt;b&gt;Dan &apos;drw&apos; Williams&lt;/b&gt; (drw@handhelds.org)&lt;/tt&gt;&lt;br/&gt;
-&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>Report</source>
         <translation>Сообщить</translation>
     </message>
     <message>
         <source>&lt;p&gt;Software can always be improved, and the Opie Team is ready to do so. However, you - the user - must tell us when something does not work as expected or could be done better.&lt;/p&gt;
 &lt;p&gt;The Open Palmtop Integrated Environment has a bug tracking system. Visit &lt;i&gt;http://opie.handhelds.org/&lt;/i&gt; to report bugs.&lt;/p&gt;
 &lt;p&gt;If you have a suggestion for improvement then you are welcome to use the bug tracking system to register your wish. Make sure you use the severity called &quot;Feature Wish&quot;.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Программное обеспечение всегда можно улучшить, и команда Opie готова это сделать. Но вы - пользователь - должны сообщить нам когда программы не работают так, как они должны, или могли бы работать лучше.&lt;/p&gt;
 &lt;p&gt;У Open Palmtop Integrated Environment есть система отслеживания багов. Зайдите на &lt;i&gt;http://opie.han0dhelds.org/&lt;/i&gt; чтобы сообщить об ошибках.&lt;/p&gt;
 &lt;p&gt;Если у вас есть свои предложения, вы можете использовать эту же систему. Пожалуйста убедитесь что вы отметили уровень серьезности &quot;Feature Wish&quot;(&quot;Пожелание&quot;).&lt;/p&gt;</translation>
     </message>
     <message>
diff --git a/i18n/ru/libbatteryapplet.ts b/i18n/ru/libbatteryapplet.ts
index 228962b..60e5118 100644
--- a/i18n/ru/libbatteryapplet.ts
+++ b/i18n/ru/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">Закрыть</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>Заряжается</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Остался процент заряда</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>Статус аккумулятора:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>Хороший</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>Низкий</translation>
     </message>
     <message>
@@ -41,64 +33,44 @@
         <source>On backup power</source>
         <translation>На запасном питании</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Питание подключено</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Внешний источник отключен</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Осталось времени на заряде</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Статус аккумулятора</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Неудача</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>не смог открыть файл</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Заряжаются оба устройства</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Остался процент заряда:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Осталось времени на заряде:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Нету вставленного аккумулятора</translation>
     </message>
     <message>
         <source>no data</source>
         <translation>нет данных</translation>
     </message>
     <message>
-        <source>Ipaq  </source>
-        <translation type="obsolete">Ipaq  </translation>
-    </message>
-    <message>
         <source>Jacket  </source>
         <translation>Куртка  </translation>
     </message>
     <message>
         <source>Remaining Power: %1%</source>
         <translation>Осталось заряда: %1%</translation>
     </message>
     <message>
         <source>Remaining Time: %1m %2s</source>
         <translation>Осталось времени: %1мин %2сек</translation>
     </message>
     <message>
diff --git a/i18n/ru/libcable.ts b/i18n/ru/libcable.ts
index dfc3b68..0314e08 100644
--- a/i18n/ru/libcable.ts
+++ b/i18n/ru/libcable.ts
@@ -147,25 +147,21 @@
     <message>
         <source>Hardware</source>
         <translation>Аппаратный</translation>
     </message>
     <message>
         <source>Software</source>
         <translation>Программный</translation>
     </message>
 </context>
 <context>
     <name>CableNetNode</name>
     <message>
-        <source>Cable Connection</source>
-        <translation type="obsolete">Кабельное соединение</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Sets up a wired serial or parallel.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Устанавливает последовательную или параллельную связь по кабелю.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Cable connection</source>
         <translation>Проводное соединение</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libliquid.ts b/i18n/ru/libliquid.ts
index f4baaa4..a6d943e 100644
--- a/i18n/ru/libliquid.ts
+++ b/i18n/ru/libliquid.ts
@@ -1,75 +1,68 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">Жидкость</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation>Стиль Жидкость</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation>Непрозрачные</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation>Полосы, цвет фона</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation>Полосы, цвет кнопок</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation>Прозрачный с полосами, цвет фона</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation>Прозрачный с полосами, цвет кнопок</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation>Свой уровень прозрачности</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation>Цвет меню</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation>Цвет текста</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation>Непрозрачность</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation>Текст меню отбрасывает тень</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation>Показывать плоские кнопки инструментов</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation>Контраст полос</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
-        <translation>Жидкость</translation>
+        <translation type="unfinished">Жидкость</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation>Стиль High Performance Liquid, сделал Mosfet</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libmemoryapplet.ts b/i18n/ru/libmemoryapplet.ts
index b48435f..4248a5b 100644
--- a/i18n/ru/libmemoryapplet.ts
+++ b/i18n/ru/libmemoryapplet.ts
@@ -114,28 +114,24 @@ Memory is categorized as follows:
         <source>Manage Swapfile</source>
         <translation>Управление файлами подкачки</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Создать</translation>
     </message>
     <message>
         <source>Remove</source>
         <translation>Убрать</translation>
     </message>
     <message>
-        <source>2 Mb,4 Mb,6 Mb,8 Mb</source>
-        <translation type="obsolete">2, 4, 6, 8 Мбайт</translation>
-    </message>
-    <message>
         <source>Failed to detach swapfile.</source>
         <translation>Не смог отключить файл подкачки.</translation>
     </message>
     <message>
         <source>Swapfile deactivated.</source>
         <translation>Файл подкачки отключен.</translation>
     </message>
     <message>
         <source>Failed to create swapfile.</source>
         <translation>Не могу создать файл подкачки.</translation>
     </message>
     <message>
diff --git a/i18n/ru/libnetworksettings2.ts b/i18n/ru/libnetworksettings2.ts
index 5b26482..f800643 100644
--- a/i18n/ru/libnetworksettings2.ts
+++ b/i18n/ru/libnetworksettings2.ts
@@ -32,32 +32,24 @@
         <source>Connection Profile</source>
         <translation>Профиль соединения</translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle IP packets&lt;/p&gt;</source>
         <translation>&lt;p&gt;Устройства, которые могут обрабатывать IP пакеты&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Devices that can handle single bytes&lt;/p&gt;</source>
         <translation>&lt;p&gt;Устройства, которые могут обрабатывать отдельные байты&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>&lt;p&gt;Nodes that provide working IP connections&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Ноды, которые обеспечивают рабочие IP соединения&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Fully configured connection profile&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Полностью настроенный профиль соединения&lt;/p&gt;</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Nodes that provide working IP connection&lt;/p&gt;</source>
         <translation>&lt;p&gt;Ноды, которые обеспечивают рабочее IP соединение&lt;/p&gt;</translation>
     </message>
     <message>
         <source>&lt;p&gt;Fully configured network profile&lt;/p&gt;</source>
         <translation>&lt;p&gt;Полностью настроенный сетевой профиль&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Connection to GPRS device</source>
         <translation>Соединение с GPRS устройством</translation>
     </message>
     <message>
@@ -79,33 +71,25 @@
         <source>Unknown</source>
         <translation>Неизвестен</translation>
     </message>
     <message>
         <source>Unavailable</source>
         <translation>Недоступен</translation>
     </message>
     <message>
         <source>Disabled</source>
         <translation>Запрещен</translation>
     </message>
     <message>
-        <source>Off</source>
-        <translation type="obsolete">Отключен</translation>
-    </message>
-    <message>
         <source>Available</source>
         <translation>Доступен</translation>
     </message>
     <message>
-        <source>IsUp</source>
-        <translation type="obsolete">Включен</translation>
-    </message>
-    <message>
         <source>Inactive</source>
         <translation>Отключен</translation>
     </message>
     <message>
         <source>Up</source>
         <translation>Включен</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libopiecore2.ts b/i18n/ru/libopiecore2.ts
index be47f6a..4828b1f 100644
--- a/i18n/ru/libopiecore2.ts
+++ b/i18n/ru/libopiecore2.ts
@@ -49,28 +49,24 @@
         <source>Upper+Down</source>
         <translation>Выше+вниз</translation>
     </message>
     <message>
         <source>Upper+Right</source>
         <translation>Выше+вправо</translation>
     </message>
     <message>
         <source>Upper+Left</source>
         <translation>Выше+влево</translation>
     </message>
     <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Повернуть дисплей</translation>
-    </message>
-    <message>
         <source>Action Button</source>
         <translation>Кнопка действия</translation>
     </message>
     <message>
         <source>OK Button</source>
         <translation>Кнопка ОК</translation>
     </message>
     <message>
         <source>End Button</source>
         <translation>Кнопка &quot;End&quot;</translation>
     </message>
     <message>
diff --git a/i18n/ru/libopiepim2.ts b/i18n/ru/libopiepim2.ts
index 4cd7527..2503f17 100644
--- a/i18n/ru/libopiepim2.ts
+++ b/i18n/ru/libopiepim2.ts
@@ -1,168 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Кнопка &quot;Календарь&quot;</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Кнопка &quot;Контакты&quot;</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Кнопка меню</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Кнопка &quot;Почта&quot;</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Кнопка &quot;Домой&quot;</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Кнопка записи</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Повернуть дисплей</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Нижний+вверх</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Нижний+вниз</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Нижний+направо</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Нижний+налево</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Верхний+вверх</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Верхний+вниз</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Верхний+направо</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Верхний+налево</translation>
-    </message>
-    <message>
-        <source>OK Button</source>
-        <translation type="obsolete">Кнопка  ОК</translation>
-    </message>
-    <message>
-        <source>End Button</source>
-        <translation type="obsolete">Кнопка &quot;End&quot;</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Тон:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Насыщ.:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Красный:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Зеленый:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Синий:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Альфа канал:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Выбрать цвет</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Далее</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Далее...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Имя:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Размер</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Тип Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Большой</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Средний</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Маленький</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation>Повторяющееся событие</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Day</source>
         <translation>День</translation>
@@ -361,269 +207,38 @@ and </source>
         <translation>месяц(ев)</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation>год(а)</translation>
     </message>
     <message>
         <source>Every</source>
         <translation>Каждые</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Повторяющееся</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Нет</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">День</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Неделя</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Месяц</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Год</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Каждый(е):</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Периодичность</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Завершить:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нет даты</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Повторять по</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пнд</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втр</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Срд</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чтв</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Птн</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Суб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Вск</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Каждый(е)</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нет даты</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">дней</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">день</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">недели</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">неделя</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">месяцев</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">Месяц</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">лет</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">год</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">и</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-и</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, и</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Нет повтора</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">день(дней)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Повторять по</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пнд</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втр</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Срд</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чтв</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Птн</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Суб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Вск</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">неделя(и)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Повтор</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">День</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">месяц(ев)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">год(а)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Каждый(е)</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">по</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Время:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Выбрать время:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation>Запись</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <source>Click here to view all items.</source>
-        <translation type="obsolete">Нажмите, чтобы увидеть все записи.</translation>
-    </message>
-    <message>
-        <source>Click here to view items belonging to %1.</source>
-        <translation type="obsolete">Нажмите, чтобы увидеть все записи, принадлежащие %1.</translation>
-    </message>
-    <message>
         <source>Unfiled</source>
         <translation>Без категории</translation>
     </message>
     <message>
-        <source>Click here to view all unfiled items.</source>
-        <translation type="obsolete">Нажмите, чтобы увидеть все несохраненные записи.</translation>
-    </message>
-    <message>
         <source>View</source>
         <translation>Вид</translation>
     </message>
     <message>
         <source>New</source>
         <translation>Создать</translation>
     </message>
     <message>
         <source>Click here to create a new item.</source>
         <translation>Нажмите, чтобы создать новую запись.</translation>
     </message>
     <message>
@@ -650,91 +265,37 @@ and </source>
         <source>Click here to delete the selected item.</source>
         <translation>Нажмите, чтобы удалить выбранную запись.</translation>
     </message>
     <message>
         <source>Beam</source>
         <translation>Отправить</translation>
     </message>
     <message>
         <source>Click here to transmit the selected item.</source>
         <translation>Нажмите, чтобы передать выбранную запись.</translation>
     </message>
     <message>
-        <source>Find</source>
-        <translation type="obsolete">Найти</translation>
-    </message>
-    <message>
-        <source>Click here to search for an item.</source>
-        <translation type="obsolete">Нажмите для поиска записи.</translation>
-    </message>
-    <message>
         <source>Configure</source>
         <translation>Настроить</translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation>Нажмите, чтобы задать настройки для этого приложения.</translation>
     </message>
     <message>
-        <source>Filter</source>
-        <translation type="obsolete">Фильтр</translation>
-    </message>
-    <message>
-        <source>Click here to filter the items displayed.</source>
-        <translation type="obsolete">Нажмите, чтобы отфильтровать отображаемые записи.</translation>
-    </message>
-    <message>
-        <source>Filter Settings</source>
-        <translation type="obsolete">Настройки фильтра</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current filter settings.</source>
-        <translation type="obsolete">Нажмите, чтобы изменить настройки текущего фильтра.</translation>
-    </message>
-    <message>
         <source>Click here to filter items by category.</source>
         <translation>Щелкните, чтобы отфильтровать записи по категории.</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">ФайлДиалог</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Открыть</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Стиль</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Размер</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>Прогресс:</translation>
     </message>
     <message>
         <source>Deadline:</source>
         <translation>Предел:</translation>
@@ -887,36 +448,24 @@ and </source>
         <source>Friday</source>
         <translation>Пятница</translation>
     </message>
     <message>
         <source>Saturday</source>
         <translation>Суббота</translation>
     </message>
     <message>
         <source>Sunday</source>
         <translation>Воскресение</translation>
     </message>
     <message>
-        <source>Documents</source>
-        <translation type="obsolete">Документы</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">Файлы</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">Все файлы</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>
@@ -931,32 +480,24 @@ and </source>
         <source>Location:</source>
         <translation>Место:</translation>
     </message>
     <message>
         <source>This is an all day event</source>
         <translation>Это событие на весь день</translation>
     </message>
     <message>
         <source>This is a multiple day event</source>
         <translation>Это событие на несколько дней</translation>
     </message>
     <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
-    </message>
-    <message>
         <source>The %1 %2 of every</source>
         <translation>%1 %2 каждые</translation>
     </message>
     <message>
         <source>Description:</source>
         <translation>Описание:</translation>
     </message>
     <message>
         <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
     </message>
     <message>
diff --git a/i18n/ru/libopiesecurity2.ts b/i18n/ru/libopiesecurity2.ts
index 862e8a5..7718982 100644
--- a/i18n/ru/libopiesecurity2.ts
+++ b/i18n/ru/libopiesecurity2.ts
@@ -1,94 +1,40 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>MultiauthMainWindow</name>
-    <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="obsolete">Добро пожаловать в систему методов аутентификации Opie</translation>
-    </message>
-    <message>
-        <source>Launching authentication plugins...</source>
-        <translation type="obsolete">Загружаю плагины аутентификации...</translation>
-    </message>
-    <message>
-        <source>Proceed...</source>
-        <translation type="obsolete">Продолжить...</translation>
-    </message>
-    <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="obsolete">Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</translation>
-    </message>
-    <message>
-        <source>Congratulations! Your authentication has been successful.</source>
-        <translation type="obsolete">Поздравляем! Процесс аутентификации завершен.</translation>
-    </message>
-    <message>
-        <source>You have not succeeded enough authentication steps!</source>
-        <translation type="obsolete">Вы не прошли процесс аутентификации!</translation>
-    </message>
-    <message>
-        <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
-        <translation type="obsolete">Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
-    </message>
-</context>
-<context>
     <name>Opie::Security::MultiauthMainWindow</name>
     <message>
-        <source>Welcome to Opie Multi-authentication Framework</source>
-        <translation type="obsolete">Добро пожаловать в систему методов аутентификации Opie</translation>
-    </message>
-    <message>
         <source>Launching authentication plugins...</source>
         <translation>Загружаю плагины аутентификации...</translation>
     </message>
     <message>
         <source>Proceed...</source>
         <translation>Продолжить...</translation>
     </message>
     <message>
-        <source>Note: the &apos;exit&apos; button should be removed for real protection, through Security config dialog</source>
-        <translation type="obsolete">Примечание: кнопку &apos;выйти&apos; следует удалить для реальной защиты, через диалог настроек Безопасности</translation>
-    </message>
-    <message>
         <source>Congratulations! Your authentication has been successful.</source>
         <translation>Поздравляем! Процесс аутентификации завершен.</translation>
     </message>
     <message>
-        <source>You have not succeeded enough authentication steps!</source>
-        <translation type="obsolete">Вы не прошли процесс аутентификации!</translation>
-    </message>
-    <message>
-        <source>Note: if &apos;allow to bypass&apos; was uncheck in Security config, you would have to go back through all the steps now.</source>
-        <translation type="obsolete">Примечание: если опция &apos;разрешить пропуск&apos; была отключена в настройках Безопасности, вам придется начать сначала.</translation>
-    </message>
-    <message>
         <source>Welcome to Opie</source>
         <translation>Добро пожаловать в Opie</translation>
     </message>
     <message>
         <source>Note: this &apos;exit&apos; button only appears during &lt;b&gt;simulations&lt;/b&gt;, like the one we are in. If you don&apos;t succeed a step, remember you can &lt;b&gt;skip&lt;/b&gt; it.</source>
         <translation>Примечание: кнопка &apos;выйти&apos; показана только во время &lt;b&gt;демонстраций&lt;/b&gt;, в которой мы сейчас находимся. Если какая-та стадия неудалась, ее можно &lt;b&gt;пропустить&lt;/b&gt;.</translation>
     </message>
     <message>
         <source>You have &lt;b&gt;not&lt;/b&gt; succeeded enough authentication steps!</source>
         <translation>Вы &lt;b&gt;не&lt;/b&gt; прошли достаточно стадий аутентификации!</translation>
     </message>
     <message>
         <source>Be careful: if this was not a &lt;b&gt;simulation&lt;/b&gt;, you would have to go back through all the steps now.</source>
         <translation>Осторожно: если бы это не было &lt;b&gt;демонстрацией&lt;/b&gt;, вам бы пришлось повторить все стадии сначала.</translation>
     </message>
 </context>
 <context>
     <name>Opie::Security::SecOwnerDlg</name>
     <message>
         <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
         <translation>Пожалуйста найдите владельца (см. ниже), или попробуйте щелкнуть еще раз на этом экране, если вы являетесь владельцем</translation>
     </message>
 </context>
-<context>
-    <name>SecOwnerDlg</name>
-    <message>
-        <source>Please contact the owner (directions follow), or try again clicking of this screen (and waiting for the penalty time) if you are the legitimate owner</source>
-        <translation type="obsolete">Пожалуйста найдите владельца (см. ниже), или поппробуйте щелкнуть еще раз на этом экране, если вы являетесь владельцем</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/ru/libopieui2.ts b/i18n/ru/libopieui2.ts
index 68c9393..341cd41 100644
--- a/i18n/ru/libopieui2.ts
+++ b/i18n/ru/libopieui2.ts
@@ -1,473 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">Кнопка &quot;Календарь&quot;</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">Кнопка &quot;Контакты&quot;</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">Кнопка меню</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">Кнопка &quot;Почта&quot;</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">Кнопка &quot;Домой&quot;</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">Кнопка записи</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">Повернуть дисплей</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">Нижний+вверх</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">Нижний+вниз</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">Нижний+направо</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">Нижний+налево</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">Верхний+вверх</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">Верхний+вниз</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">Верхний+направо</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">Верхний+налево</translation>
-    </message>
-    <message>
-        <source>OK Button</source>
-        <translation type="obsolete">Кнопка  ОК</translation>
-    </message>
-    <message>
-        <source>End Button</source>
-        <translation type="obsolete">Кнопка &quot;End&quot;</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">Тон:</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">Насыщ.:</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">Красный:</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">Зеленый:</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">Синий:</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">Альфа канал:</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">Выбрать цвет</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">Далее</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">Далее...</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">ФайлДиалог</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">Открыть</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">Сохранить</translation>
-    </message>
-    <message>
-        <source>Select Directory</source>
-        <translation type="obsolete">Выбрать каталог</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">Имя:</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Размер</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Тип Mime</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">Большой</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">Средний</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">Маленький</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">Стиль</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Размер</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">А ещё хорошо уметь всем на зависть чётко и складно писать буквы и цифры!</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyChooserConfigDialog</name>
-    <message>
-        <source>Configure Key</source>
-        <translation type="obsolete">Настроить ключ</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Pixmap</source>
-        <translation type="obsolete">Изображение</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Key</source>
-        <translation type="obsolete">Ключ</translation>
-    </message>
-    <message>
-        <source>Default Key</source>
-        <translation type="obsolete">Ключ по умолчанию</translation>
-    </message>
-    <message>
-        <source>Shortcut for Selected Action</source>
-        <translation type="obsolete">Ссылка для выбранного действия</translation>
-    </message>
-    <message>
-        <source>&amp;None</source>
-        <translation type="obsolete">&amp;Нет</translation>
-    </message>
-    <message>
-        <source>&amp;Default</source>
-        <translation type="obsolete">&amp;По умолчанию</translation>
-    </message>
-    <message>
-        <source>C&amp;ustom</source>
-        <translation type="obsolete">&amp;Своя</translation>
-    </message>
-    <message>
-        <source>Configure Key</source>
-        <translation type="obsolete">Настроить ключ</translation>
-    </message>
-    <message>
-        <source>Default: </source>
-        <translation type="obsolete">По умолчанию:</translation>
-    </message>
-    <message>
-        <source>Key is on BlackList</source>
-        <translation type="obsolete">Ключ в черном списке</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;The Key you choose is on the black list and may not be used with this manager. Please use a different key.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Выбранный вами ключ находится в черном списке и не может быть использован с этим менеджером. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Key is already assigned</source>
-        <translation type="obsolete">Ключ уже зарегистрирован</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Выбранный вами ключ уже используется в другом пункте вашей конфигурации. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Повторяющееся</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Нет</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">День</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Неделя</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Месяц</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Год</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Каждый(е):</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Периодичность</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Завершить:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нет даты</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Повторять по</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пнд</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втр</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Срд</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чтв</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Птн</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Суб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Вск</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Каждый(е)</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Нет даты</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">дней</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">день</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">недели</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">неделя</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">месяцев</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">Месяц</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">лет</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">год</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">и</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">,
-и</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">, и</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">Нет повтора</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">день(дней)</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Повторять по</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Пнд</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Втр</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Срд</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Чтв</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Птн</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Суб</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Вск</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">неделя(и)</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">Повтор</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">День</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">месяц(ев)</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">год(а)</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Каждый(е)</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">по</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>
@@ -596,449 +137,38 @@ and </source>
         <translation>&lt;qt&gt;Выбранный вами ключ находится в черном списке и не может быть использован с этим менеджером. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation>Ключ уже зарегистрирован</translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Выбранный вами ключ уже используется в другом пункте вашей конфигурации. Пожалуйста выберите другой ключ.&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">Размер</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">Тип Mime</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Priority:</source>
-        <translation type="obsolete">Приоритет:</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">Прогресс:</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">Предел:</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">Категория:</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">E-mail по умолчанию:</translation>
-    </message>
-    <message>
-        <source>Office: </source>
-        <translation type="obsolete">Офис:</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">Раб. WEB-страница:</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">Раб. телефон:</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">Раб. факс:</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">Раб. моб.:</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">Раб. пейджер:</translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">Дом. WEB-страница:</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">Дом. тел.:</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">Дом. факс:</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">Дом. моб.:</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">Все Email:</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">Профессия:</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">Помощник:</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">Управляющий:</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">Муж</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">Жен</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">Пол:</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">Супруг(а):</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">День рожд.:</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">Годовщина:</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">Дети:</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">Прозвище:</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">Заметки:</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">Начало:</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">Окон.:</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">Заметка:</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Каждые</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">%1 %2 кажд.</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">%1 каждые</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">Каждые</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">Понедельник</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">Вторник</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">Среда</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">Четверг</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">Пятница</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">Суббота</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">Воскресение</translation>
-    </message>
-    <message>
         <source>Documents</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>Файлы</translation>
     </message>
     <message>
         <source>All Files</source>
         <translation>Все файлы</translation>
     </message>
     <message>
-        <source>Very high</source>
-        <translation type="obsolete">Очень высокий</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">Высокий</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Нормальный</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">Низкий</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">Очень низкий</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">Место:</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">Это событие на весь день</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">Это событие на несколько дней</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>The %1 %2 of every</source>
-        <translation type="obsolete">%1 %2 каждые</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">Описание:</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;b&gt;Раб. адрес:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;br&gt;&lt;b&gt;Дом. адрес:&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>User Id</source>
-        <translation type="obsolete">ID пользователя</translation>
-    </message>
-    <message>
-        <source>Categories</source>
-        <translation type="obsolete">Категории</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Отчество</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Фамилия</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Суффикс</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Записать как</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Должность</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Отдел</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Организация</translation>
-    </message>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Раб. телефон</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Раб. факс</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Раб. мобильный</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">E-mail по умолчанию</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Email адреса</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Дом. телефон</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Дом. факс</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Дом. мобильный</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Работа - улица</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Работа - город</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Работа - область</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Работа - индекс</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Работа - страна</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Раб. пейджер</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Раб. WEB-страница</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Офис</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Профессия</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Помощник</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Управляющий</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Дом. - улица</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Дом. - город</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Дом. - область</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Дом. - индекс</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Дом. - страна</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Дом. WEB-страница</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Супруг(а)</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Пол</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">День рожд.</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Годовщина</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Прозвище</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Дети</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Заметки</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation>Каталоги</translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation>Все каталоги</translation>
     </message>
 </context>
diff --git a/i18n/ru/libppp.ts b/i18n/ru/libppp.ts
index 7359289..056da2c 100644
--- a/i18n/ru/libppp.ts
+++ b/i18n/ru/libppp.ts
@@ -183,40 +183,24 @@
     <message>
         <source>Commands</source>
         <translation>Команды</translation>
     </message>
     <message>
         <source>Dialing</source>
         <translation>Набор</translation>
     </message>
 </context>
 <context>
     <name>PPPIPEdit</name>
     <message>
-        <source>IPAddress needed</source>
-        <translation type="obsolete">Необходим IP адрес</translation>
-    </message>
-    <message>
-        <source>IPAddress not valid</source>
-        <translation type="obsolete">IP адрес неверен</translation>
-    </message>
-    <message>
-        <source>Subnet mask needed</source>
-        <translation type="obsolete">Необходима маска подсети</translation>
-    </message>
-    <message>
-        <source>Subnet mask not valid</source>
-        <translation type="obsolete">Маска подсети неверна</translation>
-    </message>
-    <message>
         <source>Gateway address needed</source>
         <translation>Необходим адрес шлюза</translation>
     </message>
     <message>
         <source>Gateway address not valid</source>
         <translation>Адрес шлюза неверен</translation>
     </message>
 </context>
 <context>
     <name>PPPIPGUI</name>
     <message>
         <source>PPPIP</source>
@@ -226,28 +210,24 @@
         <source>IP</source>
         <translation>IP</translation>
     </message>
     <message>
         <source>Server assigned</source>
         <translation>Задан сервером</translation>
     </message>
     <message>
         <source>Fixed</source>
         <translation>Постоянный</translation>
     </message>
     <message>
-        <source>Subnetmask</source>
-        <translation type="obsolete">Маска подсети</translation>
-    </message>
-    <message>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
         <source>Gateway</source>
         <translation>Шлюз</translation>
     </message>
     <message>
         <source>Set as default</source>
         <translation>Установить по умолчанию</translation>
     </message>
     <message>
@@ -261,28 +241,24 @@
     <message>
         <source>Remote</source>
         <translation>Удаленный</translation>
     </message>
     <message>
         <source>Only if not yet set</source>
         <translation>Только если уже не задан</translation>
     </message>
 </context>
 <context>
     <name>PPPNetNode</name>
     <message>
-        <source>PPP Connection</source>
-        <translation type="obsolete">PPP соединение</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Sets up IP using PPP.&lt;/p&gt;&lt;p&gt;Use this for dialup devices or serial setups&lt;/p&gt;</source>
         <translation>&lt;p&gt;Устанавливает IP связь через PPP.&lt;/p&gt;&lt;p&gt;Используйте для телефонных модемов или последовательных линий&lt;/p&gt;</translation>
     </message>
     <message>
         <source>PPP connection</source>
         <translation>PPP соединение</translation>
     </message>
 </context>
 <context>
     <name>PPPRunGUI</name>
     <message>
         <source>PPPRun</source>
diff --git a/i18n/ru/libprofile.ts b/i18n/ru/libprofile.ts
index 64842f1..f7e413f 100644
--- a/i18n/ru/libprofile.ts
+++ b/i18n/ru/libprofile.ts
@@ -13,28 +13,24 @@
         <source>Start</source>
         <translation>Начать</translation>
     </message>
     <message>
         <source>Automatically</source>
         <translation>Автоматически</translation>
     </message>
     <message>
         <source>Ask</source>
         <translation>Спросить</translation>
     </message>
     <message>
-        <source>Disabled</source>
-        <translation type="obsolete">Запрещен</translation>
-    </message>
-    <message>
         <source>Trigger VPN</source>
         <translation>Включить VPN</translation>
     </message>
     <message>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
         <source>State</source>
         <translation>Состояние</translation>
     </message>
     <message>
@@ -101,32 +97,24 @@
         <source>Errors</source>
         <translation>Ошибки</translation>
     </message>
     <message>
         <source>Dropped</source>
         <translation>Отброшено</translation>
     </message>
     <message>
         <source>Bytes</source>
         <translation>Байтов</translation>
     </message>
     <message>
-        <source>Transmitting</source>
-        <translation type="obsolete">Исходящий</translation>
-    </message>
-    <message>
-        <source>Others</source>
-        <translation type="obsolete">Прочие</translation>
-    </message>
-    <message>
         <source>Collisions</source>
         <translation>Коллизии</translation>
     </message>
     <message>
         <source>Live feed </source>
         <translation>Прямая передача</translation>
     </message>
     <message>
         <source>Enabled</source>
         <translation>Разрешен</translation>
     </message>
     <message>
diff --git a/i18n/ru/libqpe.ts b/i18n/ru/libqpe.ts
index 45cb720..927b30e 100644
--- a/i18n/ru/libqpe.ts
+++ b/i18n/ru/libqpe.ts
@@ -185,28 +185,24 @@ editing categories.</source>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Строка не найдена.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Конец достигнут, продолжаю с начала</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation>Конец достигнут, начинаю с %1</translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
@@ -443,32 +439,24 @@ Please free up some space
 before entering data</source>
         <translation>Не могу создать загрузочные файлы
 Пожалуйста освоюодите место
 прежде чем вводить данные</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Не могу установить будильник.
 Пожалуйста освободите место и попробуйте снова.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">Д</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">М</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>Г</translation>
     </message>
     <message>
         <source>day</source>
         <translation>день</translation>
     </message>
     <message>
         <source>month</source>
         <translation>месяц</translation>
     </message>
     <message>
@@ -775,44 +763,24 @@ Free some memory and try again.</source>
         <source>Fri</source>
         <translation>Птн</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Суб</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Вск</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">Нажмите чтобы закрыть это окно, не сохраняя.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">Нажмите чтобы закрыть это окно.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">Нажмите чтобы закрыть это окно и сохранить изменения.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">Нажмите чтобы сделать это окно перемещаемым.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">Нажмите чтобы это окно заняло все доступное место на экране.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>&lt;Qt&gt;Подробная справка недоступна для этого приложения, но есть контекстная справка.&lt;p&gt;Как её использовать:&lt;p&gt;&lt;ol&gt;&lt;li&gt;нажмите и удерживайте кнопку справки.&lt;li&gt;когда заголовок окна покажет &lt;b&gt;Что это...&lt;/b&gt;, нажмите на любой контроль.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>Что это...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Вы уверены что хотите удалить
 %1?&lt;/qt&gt;</translation>
diff --git a/i18n/ru/libtodayaddressbookplugin.ts b/i18n/ru/libtodayaddressbookplugin.ts
index 7d15cb7..20a9f5d 100644
--- a/i18n/ru/libtodayaddressbookplugin.ts
+++ b/i18n/ru/libtodayaddressbookplugin.ts
@@ -1,32 +1,24 @@
 <!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 type="obsolete">Обрезать после X символов:</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">После скольки символов данные будут обрезаны</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>Set Headline Color: </source>
         <translation>Цвет заголовков:</translation>
     </message>
     <message>
@@ -51,28 +43,24 @@ Color if below </source>
         <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>&quot;Срочный&quot; цвет будет использован если дни рождения/юбилеи ближе чем заданное число дней !</translation>
     </message>
     <message>
-        <source>To activate settings: Restart application !</source>
-        <translation type="obsolete">Чтобы применить установки: Перезапустите приложение!</translation>
-    </message>
-    <message>
         <source>Enable/Disable Views</source>
         <translation>Разрешить/Запретить виды</translation>
     </message>
     <message>
         <source>Show &amp;Birthdays</source>
         <translation>Показать &amp;Дни Рождения</translation>
     </message>
     <message>
         <source>Show &amp;Anniveraries</source>
         <translation>Показать &amp;Юбилеи</translation>
     </message>
     <message>
diff --git a/i18n/ru/libtodayweatherplugin.ts b/i18n/ru/libtodayweatherplugin.ts
index 52260da..532b37d 100644
--- a/i18n/ru/libtodayweatherplugin.ts
+++ b/i18n/ru/libtodayweatherplugin.ts
@@ -97,25 +97,21 @@ Pres: </source>
         <source>SE </source>
         <translation>ЮВ</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>км/час</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>миль/час</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">кПа</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>ртути</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation>кПа</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libvpn.ts b/i18n/ru/libvpn.ts
index 780eb94..76b3a50 100644
--- a/i18n/ru/libvpn.ts
+++ b/i18n/ru/libvpn.ts
@@ -16,25 +16,21 @@
     <message>
         <source>Start automatically</source>
         <translation>Запускать автоматически</translation>
     </message>
     <message>
         <source>Confirm before start</source>
         <translation>Подтвердить перед запуском</translation>
     </message>
 </context>
 <context>
     <name>VPNNetNode</name>
     <message>
-        <source>VPN Connection</source>
-        <translation type="obsolete">VPN соединение</translation>
-    </message>
-    <message>
         <source>&lt;p&gt;Configure private IP connection.&lt;/p&gt;&lt;p&gt;Defines Secure tunnels over non secure IP sessions&lt;/p&gt;</source>
         <translation>&lt;p&gt;Настроить частное IP соединение.&lt;/p&gt;&lt;p&gt;Устанавливает безопасные туннели поверх открытых IP сессий&lt;/p&gt;</translation>
     </message>
     <message>
         <source>VPN connection</source>
         <translation>VPN соединение</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/libwlan.ts b/i18n/ru/libwlan.ts
index 74465e4..e40d8e2 100644
--- a/i18n/ru/libwlan.ts
+++ b/i18n/ru/libwlan.ts
@@ -1,305 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation>&lt;ИспИмяХоста&gt;</translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
     <message>
         <source>Wireless Configuration</source>
-        <translation type="obsolete">Конфигурация радиосети</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="obsolete">Общие</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation type="obsolete">Режим</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation type="obsolete">MAC</translation>
-    </message>
-    <message>
-        <source>Specify &amp;Access Point</source>
-        <translation type="obsolete">Указать &amp;Точку доступа</translation>
+        <translation type="unfinished">Общие</translation>
     </message>
     <message>
-        <source>Specify &amp;Channel</source>
-        <translation type="obsolete">Указать &amp;Канал</translation>
+        <source>any</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>any</source>
-        <translation type="obsolete">любой</translation>
+        <source>SSID</source>
+        <translation type="unfinished">SSID</translation>
     </message>
     <message>
         <source>Infrastructure</source>
-        <translation type="obsolete">Инфраструктура</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto</source>
-        <translation type="obsolete">Авто</translation>
+        <translation type="unfinished">Авто</translation>
     </message>
     <message>
         <source>Managed</source>
-        <translation type="obsolete">Управляемый</translation>
+        <translation type="unfinished">Управляемый</translation>
     </message>
     <message>
         <source>Ad-Hoc</source>
-        <translation type="obsolete">Равноправный</translation>
-    </message>
-    <message>
-        <source>Encryption</source>
-        <translation type="obsolete">Шифрование</translation>
-    </message>
-    <message>
-        <source>&amp;Enable Encryption</source>
-        <translation type="obsolete">&amp;Включить шифрование</translation>
-    </message>
-    <message>
-        <source>&amp;Key Setting</source>
-        <translation type="obsolete">&amp;Настройка ключей</translation>
-    </message>
-    <message>
-        <source>Key &amp;1</source>
-        <translation type="obsolete">Ключ &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;2</source>
-        <translation type="obsolete">Ключ &amp;2</translation>
-    </message>
-    <message>
-        <source>Key &amp;3</source>
-        <translation type="obsolete">Ключ &amp;3</translation>
+        <translation type="unfinished">Равноправный</translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="obsolete">Ключ &amp;4</translation>
-    </message>
-    <message>
-        <source>Non-encrypted Packets</source>
-        <translation type="obsolete">Незашифрованные пакеты</translation>
+        <source>Mode</source>
+        <translation type="unfinished">Режим</translation>
     </message>
     <message>
-        <source>&amp;Accept</source>
-        <translation type="obsolete">&amp;Принимать</translation>
+        <source>Specify &amp;Access Point</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Reject</source>
-        <translation type="obsolete">&amp;Отвергать</translation>
+        <source>MAC</source>
+        <translation type="unfinished">MAC</translation>
     </message>
     <message>
-        <source>SSID</source>
-        <translation type="obsolete">SSID</translation>
+        <source>Specify &amp;Channel</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rescan Neighbourhood</source>
-        <translation type="obsolete">Просканировать окрестности</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Chn</source>
-        <translation type="obsolete">Кнл</translation>
-    </message>
-</context>
-<context>
-    <name>WLanGUI</name>
-    <message>
-        <source>General</source>
-        <translation>Общие</translation>
-    </message>
-    <message>
-        <source>Auto</source>
-        <translation>Авто</translation>
-    </message>
-    <message>
-        <source>Managed</source>
-        <translation>Управляемый</translation>
-    </message>
-    <message>
-        <source>Ad-Hoc</source>
-        <translation>Равноправный</translation>
-    </message>
-    <message>
-        <source>Mode</source>
-        <translation>Режим</translation>
-    </message>
-    <message>
-        <source>MAC</source>
-        <translation>MAC</translation>
+        <translation type="unfinished">Кнл</translation>
     </message>
     <message>
         <source>Encryption</source>
-        <translation>Шифрование</translation>
+        <translation type="unfinished">Шифрование</translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
-        <translation>&amp;Включить шифрование</translation>
+        <translation type="unfinished">&amp;Включить шифрование</translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
-        <translation>&amp;Настройка ключей</translation>
+        <translation type="unfinished">&amp;Настройка ключей</translation>
     </message>
     <message>
         <source>Key &amp;1</source>
-        <translation>Ключ &amp;1</translation>
-    </message>
-    <message>
-        <source>Key &amp;4</source>
-        <translation>Ключ &amp;4</translation>
+        <translation type="unfinished">Ключ &amp;1</translation>
     </message>
     <message>
         <source>Key &amp;2</source>
-        <translation>Ключ &amp;2</translation>
+        <translation type="unfinished">Ключ &amp;2</translation>
     </message>
     <message>
         <source>Key &amp;3</source>
-        <translation>Ключ &amp;3</translation>
-    </message>
-    <message>
-        <source>AP</source>
-        <translation>Точка доступа</translation>
-    </message>
-    <message>
-        <source>Rate</source>
-        <translation>Скорость</translation>
-    </message>
-    <message>
-        <source>Channel</source>
-        <translation>Канал</translation>
-    </message>
-    <message>
-        <source>Station</source>
-        <translation>Станция</translation>
-    </message>
-    <message>
-        <source>ESSID</source>
-        <translation>ESSID</translation>
-    </message>
-    <message>
-        <source>Noise</source>
-        <translation>Шум</translation>
-    </message>
-    <message>
-        <source>Quality</source>
-        <translation>Качество</translation>
-    </message>
-    <message>
-        <source>Signal</source>
-        <translation>Сигнал</translation>
+        <translation type="unfinished">Ключ &amp;3</translation>
     </message>
     <message>
-        <source>SSID</source>
-        <translation>SSID</translation>
-    </message>
-    <message>
-        <source>Chn</source>
-        <translation>Кнл</translation>
-    </message>
-    <message>
-        <source>Form1</source>
-        <translation>Форма1</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <source>ESS-ID</source>
-        <translation>ESS-ID</translation>
-    </message>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation>&lt;ИспИмяХоста&gt;</translation>
-    </message>
-    <message>
-        <source>Specify Access Point</source>
-        <translation>Указать точку доступа</translation>
-    </message>
-    <message>
-        <source>Scan</source>
-        <translation>Сканировать</translation>
-    </message>
-    <message>
-        <source>Accept Non-Encrypted packets</source>
-        <translation>Принимать незашифрованные пакеты</translation>
-    </message>
-    <message>
-        <source>State</source>
-        <translation>Положение</translation>
-    </message>
-    <message>
-        <source>Freq</source>
-        <translation>Частота</translation>
-    </message>
-    <message>
-        <source>Link Quality</source>
-        <translation>Качество связи</translation>
+        <source>Key &amp;4</source>
+        <translation type="unfinished">Ключ &amp;4</translation>
     </message>
     <message>
-        <source>Live feed </source>
-        <translation>В эфире </translation>
+        <source>Non-encrypted Packets</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
-        <translation>Устройство WLan</translation>
+        <source>&amp;Accept</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Настройка сетевых карт WiFi или WLAN .&lt;/p&gt;&lt;p&gt;Задает опции для этих карт.&lt;/p&gt;</translation>
+        <source>&amp;Reject</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>WlanInfo</name>
     <message>
         <source>Interface Information</source>
-        <translation type="obsolete">Информация интерфейса</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>802.11b</source>
-        <translation type="obsolete">802.11b</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel</source>
-        <translation type="obsolete">Канал</translation>
+        <translation type="unfinished">Канал</translation>
     </message>
     <message>
         <source>Mode</source>
-        <translation type="obsolete">Режим</translation>
+        <translation type="unfinished">Режим</translation>
     </message>
     <message>
         <source>ESSID</source>
-        <translation type="obsolete">ESSID</translation>
+        <translation type="unfinished">ESSID</translation>
     </message>
     <message>
         <source>Station</source>
-        <translation type="obsolete">Станция</translation>
+        <translation type="unfinished">Станция</translation>
     </message>
     <message>
         <source>AP</source>
-        <translation type="obsolete">Точка доступа</translation>
+        <translation type="unfinished">Точка доступа</translation>
     </message>
     <message>
         <source>Rate</source>
-        <translation type="obsolete">Скорость</translation>
+        <translation type="unfinished">Скорость</translation>
     </message>
     <message>
         <source>Quality</source>
-        <translation type="obsolete">Качество</translation>
+        <translation type="unfinished">Качество</translation>
     </message>
     <message>
         <source>Noise</source>
-        <translation type="obsolete">Шум</translation>
+        <translation type="unfinished">Шум</translation>
     </message>
     <message>
         <source>Signal</source>
-        <translation type="obsolete">Сигнал</translation>
+        <translation type="unfinished">Сигнал</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/minesweep.ts b/i18n/ru/minesweep.ts
index 6a0eaa5..b8d4141 100644
--- a/i18n/ru/minesweep.ts
+++ b/i18n/ru/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Вы выиграли!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Вы подорвались!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Сапер</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Начинающий</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Продвинутый</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Эксперт</translation>
     </message>
     <message>
diff --git a/i18n/ru/opie-console.ts b/i18n/ru/opie-console.ts
index 1089ab9..bd9d15c 100644
--- a/i18n/ru/opie-console.ts
+++ b/i18n/ru/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>СинхронизирФайл</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>Набираю номер: %1</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>Неудача</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">Не удалось набрать номер.</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>Отменяю...</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>Ищу модем</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>Инициализирую...</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>Тип терминала</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>Цветовая схема</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">Размер шрифта</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">мелкий</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">средний</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">крупный</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>Преобразование конца строки</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>Входящий</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>Исходящий</translation>
     </message>
     <message>
diff --git a/i18n/ru/opie-eye.ts b/i18n/ru/opie-eye.ts
index f584871..28bc41b 100644
--- a/i18n/ru/opie-eye.ts
+++ b/i18n/ru/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation>Размер значков:</translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation>Показать панель при запуске</translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation>Сохранить статус полного экрана/авто поворота</translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation>Просморт информации</translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation>Включить авто поворот</translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation>Предыдущее изображение</translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation>На весь экран</translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation>Показывать значки</translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation>Просмотреть как</translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation>Отправить текущий</translation>
     </message>
     <message>
@@ -75,47 +87,39 @@
         <source>View Current Item</source>
         <translation>Просмотреть текущий</translation>
     </message>
     <message>
         <source>Show Image Info</source>
         <translation>Показать информацию</translation>
     </message>
     <message>
         <source>Delete Image</source>
         <translation>Удалить изображение</translation>
     </message>
     <message>
-        <source>the Image %1</source>
-        <translation type="obsolete">изображение %1</translation>
-    </message>
-    <message>
         <source>Image</source>
         <translation>Изображение</translation>
     </message>
     <message>
         <source>Start slideshow</source>
         <translation>Начать презентацию слайдов</translation>
     </message>
     <message>
         <source>the Image</source>
         <translation>Изображение</translation>
     </message>
 </context>
 <context>
     <name>PMainWindow</name>
     <message>
-        <source>Phunk View - Config</source>
-        <translation type="obsolete">Вид - настройка</translation>
-    </message>
-    <message>
         <source>Browser Keyboard Actions</source>
         <translation>Привязки клавиш браузера</translation>
     </message>
     <message>
         <source>Keyboard Configuration</source>
         <translation>Настройка клавиатуры</translation>
     </message>
     <message>
         <source>Opie Eye - Config</source>
         <translation>Глаз Opie - Настройки</translation>
     </message>
     <message>
@@ -205,45 +209,49 @@
     <message>
         <source>Select filesystem</source>
         <translation>Выбрать файловую систему</translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation>Режим списка</translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation>Не показывать отдельные окна</translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation>%1 - О Просмотр</translation>
     </message>
     <message>
-        <source>Opie Eye Caramba</source>
-        <translation type="obsolete">Карамба Глаз Opie</translation>
-    </message>
-    <message>
         <source>Show all files</source>
         <translation>Показать все файлы</translation>
     </message>
     <message>
-        <source>DirView</source>
-        <translation type="obsolete">Директории</translation>
-    </message>
-    <message>
         <source>Opie Eye</source>
         <translation>Глаз Opie</translation>
     </message>
     <message>
         <source>DocView</source>
         <translation>Документы</translation>
     </message>
     <message>
         <source>Directory View</source>
         <translation>Каталоги</translation>
     </message>
     <message>
@@ -269,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation>Ошибка: Не найден каталог камеры</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;Вы действительно хотите удалить %1&lt;br&gt; %2?&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation>Подтвердите удаление</translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation>Значок и информация</translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation>Значок и имя</translation>
     </message>
     <message>
diff --git a/i18n/ru/opie-eye_slave.ts b/i18n/ru/opie-eye_slave.ts
index cd9375f..89d5d2c 100644
--- a/i18n/ru/opie-eye_slave.ts
+++ b/i18n/ru/opie-eye_slave.ts
@@ -145,180 +145,24 @@
         <source>Compression: %1
 </source>
         <translation>Сжатие: %1
 </translation>
     </message>
     <message>
         <source>InterlaceMode: %1
 </source>
         <translation>Режим черезстрочности: %1
 </translation>
     </message>
     <message>
-        <source>Colormode: Color
-</source>
-        <translation type="obsolete">Режим: Цветной
-</translation>
-    </message>
-    <message>
-        <source>Colormode: Black and white
-</source>
-        <translation type="obsolete">Режим: Черно-белый
-</translation>
-    </message>
-    <message>
-        <source>Basic</source>
-        <translation type="obsolete">Основной</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">Обычный</translation>
-    </message>
-    <message>
-        <source>Fine</source>
-        <translation type="obsolete">Мелкий</translation>
-    </message>
-    <message>
-        <source>Quality: %1
-</source>
-        <translation type="obsolete">Качество: %1
-</translation>
-    </message>
-    <message>
-        <source>Daylight</source>
-        <translation type="obsolete">Дневной свет</translation>
-    </message>
-    <message>
-        <source>Fluorescent</source>
-        <translation type="obsolete">Флуоресцентный</translation>
-    </message>
-    <message>
-        <source>Tungsten</source>
-        <translation type="obsolete">Вольфрам</translation>
-    </message>
-    <message>
-        <source>Standard light A</source>
-        <translation type="obsolete">Обычное освещение А</translation>
-    </message>
-    <message>
-        <source>Standard light B</source>
-        <translation type="obsolete">Обычное освещение Б</translation>
-    </message>
-    <message>
-        <source>Standard light C</source>
-        <translation type="obsolete">Обычное освещение В</translation>
-    </message>
-    <message>
-        <source>D55</source>
-        <translation type="obsolete">D55</translation>
-    </message>
-    <message>
-        <source>D65</source>
-        <translation type="obsolete">D65</translation>
-    </message>
-    <message>
-        <source>D75</source>
-        <translation type="obsolete">D75</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <translation type="obsolete">Прочие</translation>
-    </message>
-    <message>
-        <source>White Balance: %1
-</source>
-        <translation type="obsolete">Баланс белого: %1
-</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">Средний</translation>
-    </message>
-    <message>
-        <source>Center weighted average</source>
-        <translation type="obsolete">Взвешенное среднее</translation>
-    </message>
-    <message>
-        <source>Spot</source>
-        <translation type="obsolete">Место</translation>
-    </message>
-    <message>
-        <source>MultiSpot</source>
-        <translation type="obsolete">МультиМестный</translation>
-    </message>
-    <message>
-        <source>Pattern</source>
-        <translation type="obsolete">Шаблон</translation>
-    </message>
-    <message>
-        <source>Partial</source>
-        <translation type="obsolete">Частичный</translation>
-    </message>
-    <message>
-        <source>Metering Mode: %1
-</source>
-        <translation type="obsolete">Режим измерения: %1
-</translation>
-    </message>
-    <message>
-        <source>Not defined</source>
-        <translation type="obsolete">Не определен</translation>
-    </message>
-    <message>
-        <source>Manual</source>
-        <translation type="obsolete">Вручную</translation>
-    </message>
-    <message>
-        <source>Normal progam</source>
-        <translation type="obsolete">Обычная программа</translation>
-    </message>
-    <message>
-        <source>Aperture priority</source>
-        <translation type="obsolete">Приоритет апертуры</translation>
-    </message>
-    <message>
-        <source>Shutter priority</source>
-        <translation type="obsolete">Приоритет задвижки</translation>
-    </message>
-    <message>
-        <source>Creative progam
-(biased toward fast shutter speed</source>
-        <translation type="obsolete">Творческая программа
-(сделана под короткую выдержку)</translation>
-    </message>
-    <message>
-        <source>Action progam
-(biased toward fast shutter speed)</source>
-        <translation type="obsolete">Программа действия
-(сделана под короткую выдержку)</translation>
-    </message>
-    <message>
-        <source>Portrait mode
-(for closeup photos with the background out of focus)</source>
-        <translation type="obsolete">Режим портрета
-(для близких объектов с размытым фоном)</translation>
-    </message>
-    <message>
-        <source>Landscape mode
-(for landscape photos with the background in focus)</source>
-        <translation type="obsolete">Альбомный режим 
-(для альбомных фотографий с резким фоном)</translation>
-    </message>
-    <message>
-        <source>Exposure Program: %1
-</source>
-        <translation type="obsolete">Программа выдержки: %1
-</translation>
-    </message>
-    <message>
         <source>Date/Time: %1
 </source>
         <translation>Дата/время: %1
 </translation>
     </message>
     <message>
         <source>&lt;qt&gt;Comment: %1
 </source>
         <translation>&lt;qt&gt;Примечания: %1
 </translation>
     </message>
     <message>
diff --git a/i18n/ru/opie-login.ts b/i18n/ru/opie-login.ts
index 0929ef1..305ca4f 100644
--- a/i18n/ru/opie-login.ts
+++ b/i18n/ru/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Нажмите на цели твердо и аккуратно
 чтобы откалибровать ваш экран.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добро пожаловать в 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>
@@ -70,28 +66,24 @@ accurately to calibrate your screen.</source>
 by an uncaught signal
 (%1)
 </source>
         <translation>Opie был завершен
 необработанным сигналом
 (%1)
 </translation>
     </message>
     <message>
         <source>Could not start Opie.</source>
         <translation>Не смог запустить 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="obsolete">&lt;center&gt;Добро пожаловать в OPIE %1&lt;/center&gt;&lt;center&gt;&amp; %2 %3&lt;/center&gt;</translation>
-    </message>
 </context>
 <context>
     <name>PasswordDialog</name>
     <message>
         <source>Set Password</source>
         <comment>Caption of the password dialog</comment>
         <translation>Установить пароль</translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;h2&gt;Please set a password for the Superuser.&lt;/h2&gt;&lt;/qt&gt;</source>
         <translation>&lt;qt&gt;&lt;h2&gt;Пожалуйста установите пароль суперпользователя.&lt;/h2&gt;&lt;/qt&gt;</translation>
     </message>
diff --git a/i18n/ru/opieirc.ts b/i18n/ru/opieirc.ts
index a2d9431..7621a81 100644
--- a/i18n/ru/opieirc.ts
+++ b/i18n/ru/opieirc.ts
@@ -65,28 +65,24 @@
         <source>Talking on channel</source>
         <translation>Разговор на канале</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>Беседа канала</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>Введите здесь свое сообщение, чтобы поучаствовать в беседе</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">CTCP</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>Query</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>Ping</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>Version</translation>
     </message>
     <message>
@@ -154,48 +150,40 @@
         <source>Channel for part not found - desynchronized?</source>
         <translation>Канал для отключения не найден - не синхронизирован?</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>Сообщение на канале с неизвестным отправителем</translation>
     </message>
     <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>Принято PRIVMSG неизвестного типа</translation>
     </message>
     <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">Смена клички неизвестного человека</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>Выход неизвестного человека - не синхронизирован?</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>тема сменена на</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>Неизвестная тема на канале - не синхронизирован?</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>Принят CTCP PING от</translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">Принят CTCP VERSION от</translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>CTCP ACTION с неизвестным человеком - не синхронизирован?</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>CTCP ACTION с неизвестным каналом - не синхронизирован?</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>CTCP ACTION с плохим адресатом</translation>
     </message>
     <message>
@@ -274,32 +262,24 @@
         <source>You left channel %1</source>
         <translation>Вы ушли с канала %1</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>%1 ушел с канала %2</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>Сообщение канала с неизвестного канала %1</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">Вы теперб известны как %1</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">%1 теперь известен как %2</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>%1 вышел (%2)</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation>Сервер %1 версии %2 поддерживает режимы пользователей &apos;%3&apos; и режимы канала &apos;%4&apos;</translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation>Подключено %1 операторов</translation>
     </message>
     <message>
@@ -380,28 +360,24 @@ Real name: %4</source>
         <source>CTCP PING with unknown channel - Desynchronized?</source>
         <translation>CTCP PING с неизвестным каналом - десинхронизирован?</translation>
     </message>
     <message>
         <source>CTCP PING with bad recipient</source>
         <translation>CTCP ACTION с плохим адресатом</translation>
     </message>
     <message>
         <source>Received a CTCP VERSION request from </source>
         <translation>Получил запрос CTCP VERSION от</translation>
     </message>
     <message>
-        <source>Malformed DCC request from </source>
-        <translation type="obsolete">Неверный DCC запрос от</translation>
-    </message>
-    <message>
         <source>Received a CTCP PING reply from %1: %2 seconds</source>
         <translation>Принят CTCP PING ответ от %1: %2 секунд</translation>
     </message>
     <message>
         <source>Received a CTCP PING request from %1</source>
         <translation>Принят CTCP PING запрос от %1</translation>
     </message>
     <message>
         <source>Malformed DCC request from %1</source>
         <translation>Неверный DCC запрос от %1</translation>
     </message>
     <message>
@@ -494,36 +470,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>Необходимо имя профиля</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>Необходимо имя хоста</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">Необходим порт</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>Необходима кличка</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">Необходимо настоящее имя</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>Список каналов должен содержать
 список имен каналов через запятую
 которые начинаются с &apos;#&apos; или &apos;+&apos;</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
@@ -556,28 +524,24 @@ comma separated list of channel
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>Изменить выбранный профиль сервера</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>Добавить новый профиль сервера</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">Соединение с</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>Сообщения сервера</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>Здесь вводите команды. Список доступных команд находится внутри справки OpieIRC</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation>Подключаюсь к</translation>
     </message>
 </context>
diff --git a/i18n/ru/opiemail.ts b/i18n/ru/opiemail.ts
index bcb70aa..15b2069 100644
--- a/i18n/ru/opiemail.ts
+++ b/i18n/ru/opiemail.ts
@@ -70,28 +70,24 @@
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>&lt;p&gt;Please select a File.&lt;/p&gt;</source>
         <translation>&lt;p&gt;Пожалуйста выберите файл.&lt;/p&gt;</translation>
     </message>
     <message>
         <source>Sending mail</source>
         <translation>Отправляю почту</translation>
     </message>
     <message>
-        <source>No Receiver spezified</source>
-        <translation type="obsolete">Не задан адресат</translation>
-    </message>
-    <message>
         <source>Store message</source>
         <translation>Сохранить сообщение</translation>
     </message>
     <message>
         <source>Store message into drafts?</source>
         <translation>Сохранить сообщение в черновиках?</translation>
     </message>
     <message>
         <source>Yes</source>
         <translation>Да</translation>
     </message>
     <message>
@@ -242,28 +238,24 @@
 </context>
 <context>
     <name>IMAPconfigUI</name>
     <message>
         <source>Configure IMAP</source>
         <translation>Настроить IMAP</translation>
     </message>
     <message>
         <source>User</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Исп. SSL</translation>
-    </message>
-    <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
         <source>Server</source>
         <translation>Сервер</translation>
     </message>
     <message>
@@ -332,24 +324,76 @@
     <message>
         <source>Sender</source>
         <translation>Отправитель</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
+    <message>
+        <source>Server</source>
+        <translation type="unfinished">Сервер</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished">Создать новую папку</translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation>Выписанные группы новостей</translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -359,32 +403,24 @@
         <source>Newsgroups</source>
         <translation>Группы новостей</translation>
     </message>
     <message>
         <source>List of groups from the server. On start, only subscribed groups are listed.</source>
         <translation>Список групп на сервере. При запуске, только выписанные группы будут показаны.</translation>
     </message>
     <message>
         <source>Groupfilter:</source>
         <translation>Фильтр групп:</translation>
     </message>
     <message>
-        <source>Enter a filter string here.
-Then hit &quot;get newsgroup list&quot; again and only groups starting 
-with that filter will be listet.</source>
-        <translation type="obsolete">Введите строку фильтра.
-Потом нажмите &quot;получить список групп новостей&quot; снова и только группы,
-начинающиеся с этой строки, будут показаны.</translation>
-    </message>
-    <message>
         <source>Get newsgroup list from server</source>
         <translation>Получить список групп новостей с сервера</translation>
     </message>
     <message>
         <source>Retrieve the list of groups from server</source>
         <translation>Загрузить список групп новостей с сервера</translation>
     </message>
     <message>
         <source>Enter a filter string here.
 Then hit &quot;get newsgroup list&quot; again and only groups starting 
 with that filter will be listed.</source>
         <translation>Введите строку фильтра.
@@ -562,28 +598,24 @@ with that filter will be listed.</source>
 </context>
 <context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation>Настроить SMTP</translation>
     </message>
     <message>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
-        <source>Use SSL</source>
-        <translation type="obsolete">Исп. SSL</translation>
-    </message>
-    <message>
         <source>Use Login</source>
         <translation>Исп. регистрацию</translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation>Имя учетной записи</translation>
     </message>
     <message>
         <source>Name of the SMTP Server</source>
         <translation>Имя SMTP сервера</translation>
     </message>
     <message>
@@ -675,34 +707,31 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation>Как часто проверять</translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation>Зажигать светодиод когда есть новая почта</translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation>Проигрывать звук когда есть новая почта</translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation>Форма1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
-        <translation>ТекстМетка1</translation>
+        <source>Click activate server/folder</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation>Показать текст</translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation>Сохранить вложение</translation>
     </message>
@@ -745,32 +774,36 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить это сообщение? &lt;br&gt;&lt;br&gt;</translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation>Показать предв. просмотр изображения</translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation>E-Mail от %1</translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
-        <source>E-Mail by %1</source>
-        <translation type="obsolete">E-Mail от %1</translation>
-    </message>
-    <message>
         <source>Mail</source>
         <translation>Почта</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation>Ответить</translation>
     </message>
     <message>
         <source>Forward</source>
         <translation>Переслать</translation>
     </message>
     <message>
@@ -792,24 +825,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
     <message>
         <source>Size</source>
         <translation>Размер</translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation>Вид e-mail</translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation>Выберите учетную запись SMTP</translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/ru/opierec.ts b/i18n/ru/opierec.ts
index 1a031b6..976580a 100644
--- a/i18n/ru/opierec.ts
+++ b/i18n/ru/opierec.ts
@@ -72,58 +72,36 @@
         <source>Low Disk Space</source>
         <translation>Мало места на диске</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>Заканчивается место
 на диске или
 карта не распознана</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">секунд</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">Вы действительно хотите &lt;font size=+2&gt;&lt;B&gt;УДАЛИТЬ&lt;/B&gt;&lt;/font&gt;
-выбранный файл?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Да</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">Нет</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>Не смог удалить файл.</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>Opierec</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">Пожалуйста выберите файл для проигрывания</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>Заметка</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>Не смог открыть аудио файл.
 </translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Играть</translation>
@@ -140,56 +118,36 @@ the selected file?</source>
         <source>Ir Beam out</source>
         <translation>Отправить по ИК порту</translation>
     </message>
     <message>
         <source>Ir sent.</source>
         <translation>Отправлен.</translation>
     </message>
     <message>
         <source>Ok</source>
         <translation>Да</translation>
     </message>
     <message>
-        <source>Rec</source>
-        <translation type="obsolete">Запись</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">Место</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">Дата</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>Сжатие (меньше размер файлов)</translation>
     </message>
     <message>
         <source>mute</source>
         <translation>заглушить</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">Стоп</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation>Авто-заглушка</translation>
     </message>
     <message>
-        <source>Stereo Channels</source>
-        <translation type="obsolete">Стерео каналы</translation>
-    </message>
-    <message>
         <source>Del</source>
         <translation>Удалить</translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation>Стерео</translation>
     </message>
     <message>
         <source>Please select file to play</source>
         <translation>Пожалуйста выберите файл</translation>
     </message>
 </context>
diff --git a/i18n/ru/osearch.ts b/i18n/ru/osearch.ts
index 481d324..d24993b 100644
--- a/i18n/ru/osearch.ts
+++ b/i18n/ru/osearch.ts
@@ -5,28 +5,24 @@
         <source>OSearch</source>
         <translation>ОПоиск</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>Искать везде</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">Учет регистра</translation>
-    </message>
-    <message>
         <source>Use wildcards</source>
         <translation>По шаблону</translation>
     </message>
     <message>
         <source>The details of the current result</source>
         <translation>Детали текущего результата</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
@@ -91,52 +87,36 @@
         <source>execute</source>
         <translation>выполнить</translation>
     </message>
     <message>
         <source>open in filemanager</source>
         <translation>открыть в менеджере файлов</translation>
     </message>
     <message>
         <source>open with </source>
         <translation>открыть с</translation>
     </message>
     <message>
-        <source>show completed tasks</source>
-        <translation type="obsolete">показать завершенные задачи</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">показать события из прошлого</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">искать в датах</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>Файл:</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>Ссылка:</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>Тип MIME:</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">искать в содержимом</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>ищется %1</translation>
     </message>
     <message>
         <source>Show completed tasks</source>
         <translation>Показать завершенные задачи</translation>
     </message>
     <message>
         <source>Show past events</source>
         <translation>Показать события из прошлого</translation>
     </message>
     <message>
diff --git a/i18n/ru/oxygen.ts b/i18n/ru/oxygen.ts
index 718c5c8..cb1d52f 100644
--- a/i18n/ru/oxygen.ts
+++ b/i18n/ru/oxygen.ts
@@ -40,40 +40,28 @@
         <source>Group</source>
         <translation>Группа</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>Электронегативность</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>Радиус атома</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">Энергия ионизации</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>Плотность</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">Точка кипения</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">Точка плавления</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 Дж</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 К</translation>
     </message>
     <message>
diff --git a/i18n/ru/qpe.ts b/i18n/ru/qpe.ts
index 45468d9..688205b 100644
--- a/i18n/ru/qpe.ts
+++ b/i18n/ru/qpe.ts
@@ -64,28 +64,24 @@
         <source>OK</source>
         <translation>ОК</translation>
     </message>
 </context>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>Нажмите на цели твердо и аккуратно
 чтобы откалибровать ваш экран.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">Добро пожаловать в Opie</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation>Аккумулятор</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation>Аккумулятор разряжен</translation>
     </message>
 </context>
@@ -103,28 +99,24 @@ accurately to calibrate your screen.</source>
         <source>Tap anywhere on the screen to continue.</source>
         <translation>Коснитесь экрана для продолжения.</translation>
     </message>
     <message>
         <source>Please wait, loading %1 settings.</source>
         <translation>Подождите, загружаю установки %1.</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation>Подождите...</translation>
     </message>
     <message>
-        <source>FirstUseBackground</source>
-        <translation type="obsolete">ФонПервогоИспользования</translation>
-    </message>
-    <message>
         <source>Finish</source>
         <translation>Завершено</translation>
     </message>
 </context>
 <context>
     <name>InputMethods</name>
     <message>
         <source>Unicode</source>
         <translation>Юникод</translation>
     </message>
 </context>
 <context>
@@ -287,41 +279,24 @@ accurately to calibrate your screen.</source>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Системная дата не похожа на правильную.
 (%1)&lt;/p&gt;&lt;p&gt;Скорректировать время?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">Аккумулятор сел совсем!
-Выключите питание до тех пор,
-пока заряд не восстановится!</translation>
-    </message>
-    <message>
-        <source>Battery is running very low. </source>
-        <translation type="obsolete">Аккумулятор разряжен.</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">Запасной аккумулятор разряжен.
-Зарядите запасной аккумулятор.</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation>Бизнес-карта</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation>Безопасный Режим</translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation>&lt;P&gt;Ошибка при старте системы, система переведена в Безопасный Режим. Плагины не будут загружены. Используйте Управление Плагинами, чтобы запретить вызвавший системную ошибку.</translation>
     </message>
     <message>
@@ -384,49 +359,39 @@ immediately.</source>
         <source>Reboot</source>
         <translation>Перезагрузить</translation>
     </message>
     <message>
         <source>Restart Opie</source>
         <translation>Перезагрузить Opie</translation>
     </message>
     <message>
         <source>Shutdown</source>
         <translation>Выключить</translation>
     </message>
     <message>
-        <source>&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</source>
-        <translation type="obsolete">&lt;p&gt;
-Функции завершения сеанса предназначены для разработки и тестирования Opie. При нормальной работе эти функции не нужны.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation>Завершить сеанс...</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation>Запрос на синхронизацию</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;Неавторизованная система требует доступа к устройству.&lt;p&gt;Если у Вас Qtopia Desktop 1.5.1 и меньше, пожалуйста обновите его.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation>Запретить</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation>&lt;p&gt;Неизвестная система требует доступа к устройству.&lt;p&gt;Если Вы только что первый раз запустили синхронизатор, то это нормально.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation>Разрешить</translation>
     </message>
     <message>
diff --git a/i18n/ru/security.ts b/i18n/ru/security.ts
index f924352..72d0178 100644
--- a/i18n/ru/security.ts
+++ b/i18n/ru/security.ts
@@ -66,76 +66,40 @@ You can only select an actually configured user.</source>
         <source>Login</source>
         <translation>Войти</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхр.</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation>Внимание</translation>
     </message>
     <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <source>Ok</source>
-        <translation type="obsolete">Да</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation>Любой</translation>
     </message>
     <message>
         <source>None</source>
         <translation>Ни одного</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation>Важное замечание</translation>
     </message>
     <message>
-        <source>To be able to protect your PDA with one or more authentication plugins (for example, a simple PIN authentication), you must install at least one &lt;em&gt;opie-multiauth-*&lt;/em&gt; package! Once you have done that, you will be able to configure your PDA protection here.</source>
-        <translation type="obsolete">Чтобы защитить ваш КПК одним или более плагином аутентификации (например, простой ввод ПИН), вы должны установить хотя бы один &lt;em&gt;opie-multiauth-*&lt;/em&gt; пакет! Как только вы это сделаете, здесь вы сможете настроить защиту вашего КПК.</translation>
-    </message>
-    <message>
         <source>Locking</source>
         <translation>Блокировка</translation>
     </message>
     <message>
         <source>All user-defined net ranges will be lost.</source>
         <translation>Все заданные пользователем участки будут потеряны.</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
     <message>
@@ -157,44 +121,32 @@ You can only select an actually configured user.</source>
         <source>on Opie resume</source>
         <translation>при включении Opie</translation>
     </message>
     <message>
         <source>Multiple plugins authentication</source>
         <translation>Аутентификация со множественными плагинами</translation>
     </message>
     <message>
         <source>Required successes</source>
         <translation>Необходимо успешных</translation>
     </message>
     <message>
-        <source>Debug options</source>
-        <translation type="obsolete">Опции отладки</translation>
-    </message>
-    <message>
         <source>Don&apos;t protect this config screen</source>
         <translation>Не блокировать этот экран настройки</translation>
     </message>
     <message>
         <source>Show explanatory screens</source>
         <translation>Показывать объяснительные экраны</translation>
     </message>
     <message>
-        <source>Allow to bypass authentication</source>
-        <translation type="obsolete">Разрешить пропускать аутентификацию</translation>
-    </message>
-    <message>
-        <source>Note: the third option implies the second one</source>
-        <translation type="obsolete">Примечание: третья опция подразумевает вторую</translation>
-    </message>
-    <message>
         <source>Options</source>
         <translation>Опции</translation>
     </message>
     <message>
         <source>Testing</source>
         <translation>Проверка</translation>
     </message>
     <message>
         <source>Test the authentication now</source>
         <translation>Проверить аутентификацию</translation>
     </message>
     <message>
@@ -210,294 +162,24 @@ You can only select an actually configured user.</source>
         <translation>Если вам не нравится результат этой проверки, не забудьте изменить настройки до выхода из приложения!</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Да</translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Уст. пароль</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Изменить пароль</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Введите пароль</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Неверный пароль</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Введеный пароль неверен.
-Доступ запрещен</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Любой</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Ни одного</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">Введите новый пароль</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">Введите пароль еще раз</translation>
-    </message>
-    <message>
-        <source>Attention</source>
-        <translation type="obsolete">Внимание</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;All user-defined net ranges will be lost.</source>
-        <translation type="obsolete">&lt;p&gt;Все заданные пользователем участки будут потеряны.</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">Отмена</translation>
-    </message>
-    <message>
-        <source>Ok</source>
-        <translation type="obsolete">Да</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>WARNING</source>
-        <translation type="obsolete">ВНИМАНИЕ</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Selecting IntelliSync here will disable the FTP password.&lt;p&gt;Every machine in your netrange will be able to sync with your Zaurus!</source>
-        <translation type="obsolete">&lt;p&gt;Выбор IntelliSync запретит пароль FTP.&lt;p&gt;Любая машина в заданном участке сможет синхронизироваться с вашим КПК!</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Настройки безопасности</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Изменить пароль</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Сбросить пароль</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Требовать пароль при включении</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Синхр.</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Принимать запросы из сети:</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Пароль предоставляет минимальный уровень защиты от случайного доступа к устройству.</translation>
-    </message>
-    <message>
-        <source>Passcode</source>
-        <translation type="obsolete">Пароль</translation>
-    </message>
-    <message>
-        <source>Login</source>
-        <translation type="obsolete">Войти</translation>
-    </message>
-    <message>
-        <source>Login Automatically</source>
-        <translation type="obsolete">Входить автоматически</translation>
-    </message>
-    <message>
-        <source>This button will let you change the security passcode.  
-
-Note: This is *not* the sync password.</source>
-        <translation type="obsolete">Эта кнопка позволит вам изменить пароль.  
-
-Заметьте: это НЕ пароль для синхронизации.</translation>
-    </message>
-    <message>
-        <source>Delete the current passcode.  
-You can enter a new one at any time.</source>
-        <translation type="obsolete">Удалить текущий пароль.  
-Вы всегда сможете ввести новый.</translation>
-    </message>
-    <message>
-        <source>If you enable this option, a passcode must be entered after every resume event of your Zaurus.</source>
-        <translation type="obsolete">Если вы разрешите эту опцию, нужно будет вводить пароль при каждом включении КПК.</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="obsolete">Если вы выберите эту опцию, opie-login автоматически войдет в систему под выбранным из списка пользователем.  
-
-На Zaurus 5x00 это всегда пользователь &quot;root&quot;.</translation>
-    </message>
-    <message>
-        <source>This drop-down list allows you to select the user for auto-login
-(if enabled above).  
-
-You can only select an actually configured user.</source>
-        <translation type="obsolete">Этот список позволит выбрать пользователя для авто-входа
-(если разрешен).  
-
-Вы можете выбрать только уже настроенное имя пользователя.</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="obsolete">Выберите или введите новый участок сети.  
-
-Этот список позволяет выбрать участок сети из которого можно подключится к вашему КПК.  
-
-Например, участок сети 192.168.1.0/24 позволит любой машине с IP между 192.168.1.1 и 192.168.1.254 подключаться к (и синхронизироваться с) вашим КПК.  
-
-Запись &quot;Все&quot; позволит подключиться *любому* IP. 
-Запись &quot;Ни одного&quot; *запретит* все соединения.  
-
-Если неуверены, выберите &quot;Все&quot;.</translation>
-    </message>
-    <message>
-        <source>Delete Entry</source>
-        <translation type="obsolete">Удалить запись</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="obsolete">Удалить выбранный участок из списка
-
-Если вы нажмете эту кнопку, выбранный участок будет удален из списка.
-
-Если вы нажали эту кнопку случайно, кнопка &quot;По умолчанию&quot;
-восстановит список в том виде, когда вы первый раз запустили ваш КПК.</translation>
-    </message>
-    <message>
-        <source>Restore Defaults</source>
-        <translation type="obsolete">По умолчанию</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="obsolete">Эта кнопка восстановит список участков сети
-по умолчанию.
-
-Учтите что вручную введенные участки будут потеряны!</translation>
-    </message>
-    <message>
-        <source>Select your sync software</source>
-        <translation type="obsolete">Выберите программу</translation>
-    </message>
-    <message>
-        <source>QTopia</source>
-        <translation type="obsolete">QTopia</translation>
-    </message>
-    <message>
-        <source>IntelliSync</source>
-        <translation type="obsolete">IntelliSync</translation>
-    </message>
-    <message>
-        <source>This option changes the login behaviour of the internal FTP server.  
-
-If you have problems syncing, try the &quot;IntelliSync&quot; setting, which will accept any password you throw at the sync (FTP) port.  
-
-The default is Qtopia. It will let you log in with username &quot;root&quot; and password &quot;Qtopia&quot;.   The password is CaSeSeNsItIvE.</source>
-        <translation type="obsolete">Эта опция изменяет поведение внутреннего FTP сервера.  
-
-Если есть проблемы с соединением, попробуйте значение &quot;IntelliSync&quot;, с которым будет приниматься любое соединение по FTP порту.
-
-Значение по умолчанию - Qtopia. Оно позволит соединяться с именем &quot;root&quot; и паролем &quot;Qtopia&quot;.   Пароль чувствителен к РеГиСтРу.</translation>
-    </message>
-    <message>
-        <source>Qtopia 1.7</source>
-        <translation type="obsolete">Qtopia 1.7</translation>
-    </message>
-    <message>
-        <source>Opie 1.0</source>
-        <translation type="obsolete">Opie 1.0</translation>
-    </message>
-    <message>
-        <source>Both</source>
-        <translation type="obsolete">Оба</translation>
-    </message>
-    <message>
-        <source>Alter the Sync Protocol to tweak for the different devices.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation type="obsolete">Изменить протокол синхронизации для разных устройств.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync запретит пароль но будет каждый раз спрашивать разрешение для соединения.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 совместим с QtopiaDesktop, MultiSync и KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 изменит способ отправки данных и несовместим со старыми клиентами.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation>СинхБаза</translation>
     </message>
     <message>
         <source>Sync</source>
         <translation>Синхр.</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation>Принимать запросы из сети:</translation>
@@ -568,21 +250,17 @@ Beware that all manually entered net ranges will be lost!</source>
         <source>Opie 1.0</source>
         <translation>Opie 1.0</translation>
     </message>
     <message>
         <source>IntelliSync</source>
         <translation>IntelliSync</translation>
     </message>
     <message>
         <source>Alter the Sync Protocol to tweak for the different devices.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync will disable the password check but you&apos;ll be prompted to accept the connection.
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 will be compatible with QtopiaDesktop, MultiSync and KitchenSync
 <byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 will alter the way data is send to the client and will not work with older clients.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></source>
-        <translation>Изменить протокол синхронизации для разных устройств.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    IntelliSync запретит пароль но будет каждый раз спрашивать разрешение для соединения.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Opie1.0 совместим с QtopiaDesktop, MultiSync и KitchenSync
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    Qtopia1.7 изменит способ отправки данных и несовместим со старыми клиентами.
-<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/></translation>
+<byte value="x9"/><byte value="x9"/><byte value="x9"/><byte value="x9"/>    </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/ru/sysinfo.ts b/i18n/ru/sysinfo.ts
index f96c5d8..d1d64e1 100644
--- a/i18n/ru/sysinfo.ts
+++ b/i18n/ru/sysinfo.ts
@@ -49,35 +49,27 @@
         <source>&amp;Start Tests!</source>
         <translation>&amp;Начать тесты!</translation>
     </message>
     <message>
         <source>Click here to perform the selected tests.</source>
         <translation>Нажмите здесь чтобы начать выбранные тесты.</translation>
     </message>
     <message>
         <source>Choose a model to compare your results with.</source>
         <translation>Выберите модель для сравнения результатов.</translation>
     </message>
     <message>
-        <source>Compare To:</source>
-        <translation type="obsolete">Сравнить с:</translation>
-    </message>
-    <message>
         <source>error</source>
         <translation>ошибка</translation>
     </message>
-    <message>
-        <source>Compare:</source>
-        <translation type="obsolete">Сравнить:</translation>
-    </message>
 </context>
 <context>
     <name>FileSysInfo</name>
     <message>
         <source>CF</source>
         <translation>CF</translation>
     </message>
     <message>
         <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
         <translation>График показывает использование памяти на комакт-флэш карте.</translation>
     </message>
     <message>
@@ -150,40 +142,24 @@
         <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 type="obsolete">Эта вкладка показывает как память(т.е. RAM) распределена на вашем устройстве.
-Память разделена на следующие категории:
-
-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>Эта вкладка показывает как память(т.е. RAM) распределена на вашем устройстве.
 Память разделена на следующие категории:
 
 1. Занято - память используемая Opie и открытыми приложениями.
 2. Буфера - временное хранение для увеличения производительности.
@@ -229,28 +205,24 @@ Click and hold on a module to see additional information about the module, or to
         <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>Used by</source>
         <translation>Используется</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">Вы действительно хотите выполнить %1 для этого модуля?</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation>Вы действительно хотите выполнить
 %1 для этого модуля?</translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source>Used (%1 kB)</source>
         <translation>Исп. (%1 кбайт)</translation>
     </message>
@@ -296,28 +268,24 @@ Click and hold on a process to see additional information about the process, or
         <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 %1 to this process?</source>
-        <translation type="obsolete">Вы действительно хотите послать %1 этому процессу?</translation>
-    </message>
-    <message>
         <source>Really want to send %1
 to this process?</source>
         <translation>Действительно хотите
 послать %1 этому процессу?</translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>
     <message>
         <source>System Info</source>
         <translation>Системная Информация</translation>
     </message>
@@ -368,32 +336,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;Модель:</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>&lt;br&gt;Модель:</translation>
     </message>
     <message>
         <source>&lt;br&gt;Vendor: </source>
         <translation>&lt;br&gt;Производитель:</translation>
     </message>
     <message>
diff --git a/i18n/ru/tableviewer.ts b/i18n/ru/tableviewer.ts
index bc71abb..ce3a8a8 100644
--- a/i18n/ru/tableviewer.ts
+++ b/i18n/ru/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Не смог установить значение по умлочанию для %1, ключ не добавлена.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Нужный тип не найден</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
     <message>
         <source>key</source>
         <translation>ключ</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/ru/today.ts b/i18n/ru/today.ts
index d6cd042..9b93e01 100644
--- a/i18n/ru/today.ts
+++ b/i18n/ru/today.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Today</name>
     <message>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
         <translation>Пожалуйста, заполните бизнес-карту</translation>
     </message>
     <message>
-        <source>No plugins found</source>
-        <translation type="obsolete">Нет плагинов</translation>
-    </message>
-    <message>
         <source>No plugins activated</source>
         <translation>Нет активированных плагинов</translation>
     </message>
     <message>
         <source>Click here to launch the associated app</source>
         <translation>Щелкните для ассоциаций программ</translation>
     </message>
     <message>
         <source>Owned by </source>
         <translation>Владелец</translation>
     </message>
     <message>
diff --git a/i18n/ru/todolist.ts b/i18n/ru/todolist.ts
index a56c21d..986c949 100644
--- a/i18n/ru/todolist.ts
+++ b/i18n/ru/todolist.ts
@@ -76,136 +76,68 @@
     <message>
         <source>Edit Task</source>
         <translation>Изменить задачу</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>бесшумный</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>громкий</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">Opie Дела</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">Новая по образцу</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">Новая задача</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">Нажмите здесь чтобы создать новую задачу.</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Изменить задачу</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">Нажмите здесь чтобы изменить эту задачу.</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Просмотреть задачу</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Удалить...</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">Нажмите здесь чтобы убрать эту задачу.</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Удалить все...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>Удалить завершенные</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Отправить</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">Нажмите здесь чтобы отправить эту задачу на другое устройство.</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Найти</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>Показать завершенные задачи</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>Показать только просроч. задачи</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>Показать сроки задач</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>Показать панель быстрого доступа</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Данные</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Категория</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Опции</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>БыстрРедакт</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>Это список всех текущих задач.
 
 Список отображает следующую информацию:
 1. Завершенные - зеленая галочка значит задача выполнена. Нажмите чтобы завершить задачу.
 2. Приоритет - графическое отображение приоритета задания. Нажмите дважды чтобы изменить.
 3. Описание - описание задачи. Нажмите чтобы выбрать это задание.
 4. Предельный срок - показывает когда нужно закончить задание. Эта колонка может быть показана или скрыта через меню Опции-&gt;&apos;Показать предельные сроки&apos;.</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Все категории</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>Нет места</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation>Дела не смог
 сохранить изменения.
@@ -218,60 +150,44 @@ Quit Anyway?</source>
         <source>Todo</source>
         <translation>Дела</translation>
     </message>
     <message>
         <source>all tasks?</source>
         <translation>все задачи?</translation>
     </message>
     <message>
         <source>all completed tasks?</source>
         <translation>все завершенные задачи?</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Без категории</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>Duplicate</source>
-        <translation type="obsolete">Сдублировать</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>З.</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>Приоритет</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">Описание</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>Предельный срок</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">Настроить образцы</translation>
-    </message>
-    <message>
         <source>Priority:</source>
         <translation>Приоритет:</translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation>Редактор образцов</translation>
     </message>
     <message>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
diff --git a/i18n/ru/zsafe.ts b/i18n/ru/zsafe.ts
index 63b5875..a7d88cd 100644
--- a/i18n/ru/zsafe.ts
+++ b/i18n/ru/zsafe.ts
@@ -1,275 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZСейф</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Вы хотите удалить?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Не удалять</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Правка записи</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Имя пользователя</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Пароль</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Примечания</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Поле 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Поле 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Новая запись</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Имя записи должно отличаться
-от имени категории.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Поиск</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Запись не найдена</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Да</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Поле 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Поле 3</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Все</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">Текст</translation>
-    </message>
-    <message>
-        <source>Remove text file</source>
-        <translation type="obsolete">Убрать текстовый файл</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Не смог убрать текстовый файл.</translation>
-    </message>
-    <message>
-        <source>No document defined.
-You have to create a new document</source>
-        <translation type="obsolete">Документы не заданы.
-Вы должны создать новый документ</translation>
-    </message>
-    <message>
-        <source>Export text file</source>
-        <translation type="obsolete">Экспорт в текст файл</translation>
-    </message>
-    <message>
-        <source>Import text file</source>
-        <translation type="obsolete">Импорт из текст файла</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Не смог экспортировать в текст файл.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Не смог импортировать из текст файла.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Введите пароль</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Неверный пароль.
-
-ZСейф будет закрыт.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Неверный пароль.
-Попробовать снова?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Да</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Нет.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Пустой документ или
-неверный пароль.
-Продолжить?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;нет</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Да.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Пароль пуст.
-Пожалуйста введите снова.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Введите пароль снова</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Пароли должны быть одинаковыми.
-Пожалуйста введите снова.</translation>
-    </message>
-    <message>
-        <source>Do you want to save </source>
-        <translation type="obsolete">Вы хотите сохранить</translation>
-    </message>
-    <message>
-        <source>
-before continuing?</source>
-        <translation type="obsolete">
-прежде чем продолжать?</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Сохранить</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Не сохранять</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Файл паролей сохранен.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Вы хотите сохранить
-перед выходом?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">С&amp;охранить
-с новым
-паролем</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Категория</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Диалог ожидания</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Собираю пиктограммы...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Создать новый документ ZСейф</translation>
-    </message>
-    <message>
-        <source>Now you have to enter
-a password twice for your
-newly created document.</source>
-        <translation type="obsolete">Теперь вы должны дважды
-ввести пароль для только
-что созданного документа.</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Открыть документ ZСейф</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Сохранить документ ZСейф как..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Менеджер Паролей&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">написан Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Перевод Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZСейф версии 2.1.2&lt;br&gt;</translation>
-    </message>
-</context>
-<context>
     <name>CategoryDialog</name>
     <message>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Icon</source>
         <translation>Пиктограмма</translation>
     </message>
     <message>
         <source>Field 1</source>
         <translation>Поле 1</translation>
@@ -469,34 +208,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Пожалуйста подождите...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZСейф</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Не могу создать каталог
-%1
-
-ZСейф будет закрыт.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Сохранить документ</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>С&amp;охранить документ с новым паролем</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>&amp;Экспорт текст файла</translation>
     </message>
     <message>
@@ -591,44 +320,24 @@ ZСейф будет закрыт.</translation>
         <source>&amp;New document</source>
         <translation>&amp;Создать документ</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>О&amp;ткрыть документ</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Сохранить документ как ..</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-.../Documents/application
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Не могу создать каталог
-...//Documents/application
-
-ZСейф будет закрыт.</translation>
-    </message>
-    <message>
-        <source>Can&apos;t create directory
-...//Documents/application/zsafe
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Не могу создать каталог
-...//Documents/application/zsafe
-
-ZСейф будет закрыт.</translation>
-    </message>
-    <message>
         <source>New entry</source>
         <translation>Добавить запись</translation>
     </message>
     <message>
         <source>Edit category or entry</source>
         <translation>Правка категории или записи</translation>
     </message>
     <message>
         <source>Delete category or entry</source>
         <translation>Удалить категорию или запись</translation>
     </message>
     <message>
@@ -639,40 +348,32 @@ ZСейф будет закрыт.</translation>
         <source></source>
         <translation></translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation>Вы хотите удалить?</translation>
     </message>
     <message>
         <source>D&amp;on&apos;t Delete</source>
         <translation>&amp;Не удалять</translation>
     </message>
     <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Правка записи</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Создать запись</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation>Имя записи должно отличаться
 от имени категории.</translation>
     </message>
     <message>
         <source>Search</source>
         <translation>Поиск</translation>
     </message>
     <message>
         <source>Entry not found</source>
         <translation>Запись не найдена</translation>
@@ -817,64 +518,36 @@ password</source>
         <source>Category</source>
         <translation>Категория</translation>
     </message>
     <message>
         <source>Wait dialog</source>
         <translation>Диалог ожидания</translation>
     </message>
     <message>
         <source>Gathering icons...</source>
         <translation>Собираю пиктограммы...</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Создать новый документ ZСейф</translation>
-    </message>
-    <message>
         <source>Now you have to enter
 a password twice for your
 newly created document.</source>
         <translation>Теперь вы должны дважды
 ввести пароль для только
 что созданного документа.</translation>
     </message>
     <message>
         <source>Open ZSafe document</source>
         <translation>Открыть документ ZСейф</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Сохранить документ ZСейф как..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Менеджер Паролей&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2-jv01b&lt;br&gt;</source>
-        <translation type="obsolete">ZСейф версии 2.1.2-jv01b&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">написан Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Перевод Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>ZSafe version 2.1.2&lt;br&gt;</source>
-        <translation type="obsolete">ZСейф версии 2.1.2&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&lt;P&gt;Can&apos;t create directory %1&lt;/P&gt;&lt;P&gt;ZSafe will now exit.&lt;/P&gt;</source>
         <translation>&lt;P&gt;Не могу создать каталог %1&lt;/P&gt;&lt;P&gt;ZСейф будет закрыт.&lt;/P&gt;</translation>
     </message>
     <message>
         <source>ZSafe: </source>
         <translation>ZСейф:</translation>
     </message>
     <message>
         <source>&lt;P&gt;No document defined. You have to create a new document&lt;/P&gt;</source>
         <translation>&lt;P&gt;Документы не заданы. Вы должны создать новый документ&lt;/P&gt;</translation>
     </message>
     <message>
diff --git a/i18n/sl/addressbook.ts b/i18n/sl/addressbook.ts
index bd3ae81..1e1ccac 100644
--- a/i18n/sl/addressbook.ts
+++ b/i18n/sl/addressbook.ts
@@ -19,136 +19,60 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">Brez</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>Stiki</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">Stik</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Nov</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">Uredi</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">Izbriši</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Najdi</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">Pošlji epošto</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">Prežarči vnos</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">Moje osebne podrobnosti</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">Pogled</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation>Ne morem urejati podatkov, trenutno sinhroniziram</translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>Uredi moje osebne podrobnosti</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">Uredi naslov</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>Stiki - Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>Zmanjkalo je prostora</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>Ne morem shraniti informacije.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>All</source>
         <translation>Vse</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">Brez</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">Uvozi vCard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">Zapri iskalnik</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">Shrani vse podatke</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">Natavitve</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>Ne najdem</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">Seznam</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">Kartice</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">Kartica</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">Začni iskanje</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>Pravi tip datoteke?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;Da</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;Ne</translation>
     </message>
     <message>
@@ -170,28 +94,24 @@ Ali jo res želite odpreti?</translation>
     </message>
     <message>
         <source>Do you really want add contact for 
 %1?</source>
         <translation>Ali res želite dodati stik za 
 %1?</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>&amp;Vse da</translation>
     </message>
     <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">Izvozi vCard</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>Morate izbrati stik!</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>Morate nastaviti ime datoteke !</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1385,180 +1305,13 @@ je zastonj!</translation>
         <source>Export vCard</source>
         <translation type="unfinished">Izvozi vCard</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">Moje osebne podrobnosti</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">Službeni telefon</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">Službeni faks</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">Službeni mobitel</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">Privzeta epošta</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">Epošta</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">Domači telefon</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">Domači faks</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">Domači mobitel</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">Pisarna</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">Poklic</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">Pomočnik</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">Upravnik</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">Zakonec</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">Spol</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">Rojstni dan</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">Obletnica</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">Vzdevek</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">Otroci</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">Naziv</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">Ime</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">Medimek</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">Priimek</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Pripona</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">Datoteka kot</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">Delovno mesto</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">Oddelek</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">Podjetje</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">Ulica podjetja</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">Mesto podjetja</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">Okrožje podjetja</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">Poštna št. podjetja</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">Država podjetja</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">Službeni pozivnik</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">Službena spletna stran</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">Domača ulica</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">Domače mesto</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">Domače okrožje</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">Domača poštna številka</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">Domača država</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">Domača spletna stran</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">Zapiski</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/sl/advancedfm.ts b/i18n/sl/advancedfm.ts
index 9eff8fe..ee345a3 100644
--- a/i18n/sl/advancedfm.ts
+++ b/i18n/sl/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>Opomba</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>Ne morem preimenovati</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">Ta imenik ne obstaja</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>Prekopiraj kot</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>Izhod iz programa</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>Prežarči ven</translation>
     </message>
     <message>
@@ -137,103 +133,44 @@
         <source>Copy </source>
         <translation type="unfinished">Kopiraj</translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished">Kot</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>Kopiraj isti imenik</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">Ne morem kopirati</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">v
-</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">Ne morem prenesti
-</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>Dodaj med dokumente</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation></translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>Izberi vse</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">Ali zares izbrišem
-%1 datotek?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>Izbrišem imenik?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">Res skopiram
-%1 datotek?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>Datoteka obstaja!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">
-obstaja. Ali prepišem?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">že obstaja.
-Ali jo res želite izbrisati?</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">%1 obstaja. Ali prepišem?</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">Ne morem skopirati %1 v %2</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">Advanced FileManager
-pravice pridržane 2002-2003
-LJ.Potter&lt;llornkcor@handhelds.org&gt;
-in je licencirano pod GPL</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>Dodaj imenik med zaznamke</translation>
     </message>
     <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>
diff --git a/i18n/sl/appearance.ts b/i18n/sl/appearance.ts
index 7ec0627..236b388 100644
--- a/i18n/sl/appearance.ts
+++ b/i18n/sl/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>Uredi...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>Izbriši</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>Shrani</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">Prisili uporabo stilov v vseh programih.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">Izključi stile za naslednje programe ( &lt;b&gt;*&lt;/b&gt; je lahko uporabljena kot vse):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">Binarna datoteka</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <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>
@@ -73,64 +61,44 @@
         <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 type="obsolete">Ponovno zaženi</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">Ali bi radi ponovno zagnali %1?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">Da</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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.
@@ -161,52 +129,24 @@ Kliknite tu, da izberete željeno shemo.</translation>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>Kliknite tu, da spremenite barve v trenutni barvni shemi.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>Kliknite tu, da izbrišete barvno shemo izbrano v seznamu na levi.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>Kliknite tu, da imenujete in shranite trnutno barvno shemo.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">Kliknite tu, da dovolite vsem programom, da uporabljajo globalne nastavitve izgleda.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">Če v katerem od programov ni prikaz pravilen z uporabo globalnih nastavitev izgleda, se lahko nekatere značilnosti izklopijo za ta program.
-
-Ta prostor vam omogoča, da izberete program in katere nastavitve želite onemogočiti.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">Kliknite tu, da dodate program v gornji seznam.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">Kliknite tu, da izbrišete trenutno izbran program.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">Kliknite tu, da premaknete trenutno izbran program gor po seznamu.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">Kliknite tu, da premaknete trenutno izbran program dol po seznamu.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>Kliknite tu, da izberete željeni stil za zavihke (kot je ta program). Stili, ki so na voljo so:
 
 1. Zavihki - normalni zavihki samo z besedilom
 2. Zavihki ikone - zavihki z ikonami za vsak zavihek, besedilo se prikaže samo na trenutnem zavihku
 3. Roletni seznam - pokončen seznam zavihkov
 4. Roletni seznam ikone - pokončen seznam zavihkov z ikonami</translation>
diff --git a/i18n/sl/aqpkg.ts b/i18n/sl/aqpkg.ts
index ea72583..8bd2ad9 100644
--- a/i18n/sl/aqpkg.ts
+++ b/i18n/sl/aqpkg.ts
@@ -476,42 +476,34 @@ Ste prepričani?
         <translation>Želite odstraniti ali ponovno naložiti
 %1?</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>Odstrani ali ponovno naloži</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>Ponovno naloži</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">P</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>Želite odstraniti ali nadgraditi
 %1?</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>Odstrani ali nadgradi</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>Posodabljam Zaganjalnik...</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>&lt;b&gt;Opis&lt;/b&gt; - </translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/sl/backup.ts b/i18n/sl/backup.ts
index 3d8f683..fa9de9c 100644
--- a/i18n/sl/backup.ts
+++ b/i18n/sl/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">Kopiraj in restavriraj... delam...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>Kopiraj in restavriraj</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,28 +85,24 @@
         <source>Backup And Restore</source>
         <translation>Kopiraj in restavriraj</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>Programi</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">Shrani na</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp;Kopiraj</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>Restavriraj</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>Izberi vir</translation>
     </message>
     <message>
diff --git a/i18n/sl/calculator.ts b/i18n/sl/calculator.ts
index 2162a3f..82d8fbc 100644
--- a/i18n/sl/calculator.ts
+++ b/i18n/sl/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">Znanstveni Kalkulator</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">Kalkulator</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/sl/checkbook.ts b/i18n/sl/checkbook.ts
index e2c52c5..aea0e49 100644
--- a/i18n/sl/checkbook.ts
+++ b/i18n/sl/checkbook.ts
@@ -29,48 +29,24 @@
         <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 type="obsolete">Prihranki</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">Preverjam</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">CD</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">Denarni trg</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">Skupni fond</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -93,32 +69,24 @@
         <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 type="obsolete">Trenutno stanje: %10.00</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -173,28 +141,24 @@ Da uredite vnose po določenem polju, kliknite na ime stolpca.</translation>
         <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 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>
@@ -646,105 +610,37 @@ The value entered should always be positive.</source>
 
 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 type="obsolete">Avto</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">Računi</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">CDji</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">Oblačila</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">Računalnik</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">DVDji</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">Elektronika</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">Zabava</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">Hrana</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">Bencin</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">Različno</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">Filmi</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">Najem</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <translation type="obsolete">Potovanje</translation>
-    </message>
-    <message>
         <source>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 type="obsolete">Delo</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">Član družine</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">Različni krediti</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>Avtomatsko plačilo</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>Gotovina</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/clock.ts b/i18n/sl/clock.ts
index ea9c80e..fbe730d 100644
--- a/i18n/sl/clock.ts
+++ b/i18n/sl/clock.ts
@@ -31,72 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">Dremež</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">Ura</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">Štoparica</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>Start</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Nastavi alarm</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>Stop</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">Alarm je vključen</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">Alarm je izključen</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">Nastavi datum in uro.</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Ura: Zamudili ste alarm.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -230,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">Nastavi alarm</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">Ura</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">Minuta</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Zakasnitev dremeža
-(minut)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 alarm</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">Vse</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/sl/datebook.ts b/i18n/sl/datebook.ts
index 58535ed..f4394d2 100644
--- a/i18n/sl/datebook.ts
+++ b/i18n/sl/datebook.ts
@@ -334,24 +334,32 @@ Izhod?</translation>
     <message>
         <source>Office</source>
         <translation>Pisarna</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>Dom</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>Kategorija:</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -404,59 +412,24 @@ Izhod?</translation>
     <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>
-    </message>
-    <message>
-        <source>S</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">N</translation>
-    </message>
-    <message>
         <source>p</source>
         <translation>p</translation>
     </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Calendar</source>
         <translation>Koledar</translation>
     </message>
     <message>
         <source>Repeat...</source>
@@ -572,28 +545,24 @@ Izhod?</translation>
     <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="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>
diff --git a/i18n/sl/embeddedkonsole.ts b/i18n/sl/embeddedkonsole.ts
index 9a91595..13a8dc6 100644
--- a/i18n/sl/embeddedkonsole.ts
+++ b/i18n/sl/embeddedkonsole.ts
@@ -19,44 +19,24 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;Predlagani ukazi&lt;/B&gt;:</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>Terminal</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">Mikro</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">Majne fiksne</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">Srednje fiksne</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">Pisava</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Možnosti</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>Novo</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>Presledek</translation>
     </message>
     <message>
@@ -75,52 +55,36 @@
         <source>Paste</source>
         <translation>Prilepi</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>Prikaži seznam ukazov</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>Skrij seznam ukazov</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">Jezički na dnu</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>Zelena na črni</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>Črna na beli</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>Bela na črni</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">Črna na prozorni</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">Črna na rdeči</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">Rdeča na črni</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>Zelena na rumeni</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>Modra na Vijolčni</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>Vijolčna na modri</translation>
     </message>
     <message>
@@ -139,28 +103,24 @@
         <source>Amber on Black</source>
         <translation>Amber na črni</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>Barve</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>Hitro uredi</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">Uredi</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>Brez</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>Levo</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>Desno</translation>
     </message>
     <message>
@@ -183,28 +143,24 @@
         <source>Command List</source>
         <translation>Seznam ukazov</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>Prelom vrstice</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>Uporabi piskanje</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">Zavihki zgoraj</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/fifteen.ts b/i18n/sl/fifteen.ts
index e2d5d44..c9ebb4d 100644
--- a/i18n/sl/fifteen.ts
+++ b/i18n/sl/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>Zmešaj</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">Reši</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>Igra</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>Petnjast kosov</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/formatter.ts b/i18n/sl/formatter.ts
index 66753c8..a084b2c 100644
--- a/i18n/sl/formatter.ts
+++ b/i18n/sl/formatter.ts
@@ -13,76 +13,50 @@
         <source>File Systems</source>
         <translation>Datotečni sistemi</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>Format</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>Glavni</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">OPOZORILO:
-Spreminjanje parametrov na tej
-strani lahko povzroči, da vaš
-sistem ne bo pravilno deloval!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>Uredi fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>Preveri disk</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>Naprava</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>Priklopna točka</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">Format?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>Zares formatiram
 </translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-z</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">datotečnim sistemom?!?
-Zgubili boste vse podatke!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>Da</translation>
     </message>
     <message>
         <source>No</source>
         <translation>Ne</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>Ne morem formatirati .
 Neznan tip</translation>
@@ -120,50 +94,36 @@ Naprava je zasedena!</translation>
     <message>
         <source>No such device!</source>
         <translation>Ni take naprave!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 
 je bila uspešno formatirana.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">Poizkušam priklopiti.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>Priklop kartice ni uspel!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-je bila uspešno priklopljena.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>Zdaj lahko zaprete izhodno okno.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>Notranje</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">Tip skladišča:</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>Skupaj: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>Uporabljeno: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/sl/go.ts b/i18n/sl/go.ts
index 45c176d..dd35490 100644
--- a/i18n/sl/go.ts
+++ b/i18n/sl/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>Neodločeno.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>Naprej</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Ujetniki: črni %1, beli %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">Go</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/sl/helpbrowser.ts b/i18n/sl/helpbrowser.ts
index a74abf8..24884ac 100644
--- a/i18n/sl/helpbrowser.ts
+++ b/i18n/sl/helpbrowser.ts
@@ -21,21 +21,17 @@
         <source>Remove from Bookmarks</source>
         <translation>Odstrani iz zaznamkov</translation>
     </message>
     <message>
         <source>Bookmarks</source>
         <translation>Zaznamki</translation>
     </message>
     <message>
         <source>Help Browser</source>
         <translation>Brskalnik pomoči</translation>
     </message>
     <message>
-        <source>HelpBrowser</source>
-        <translation type="obsolete">BrskalnikPomoči</translation>
-    </message>
-    <message>
         <source>Go</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/kbill.ts b/i18n/sl/kbill.ts
index 8f8d361..c807821 100644
--- a/i18n/sl/kbill.ts
+++ b/i18n/sl/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>&amp;Datoteka</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>Ustavi igro</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;Zgodba&lt;/b&gt;&lt;p&gt;Spet je usoda sveta v vaših rokah! Zloben heker znan samo kot &apos;Bill&apos;, je ustvaril virus. Virus je tako mogočen, da lahko spremeni računalnik v pečico. (oooh!) &apos;Bill&apos; se je kloniral v biljone mikro-Billov. Njihov namen je, da virus zakrijejo v popularen operacijski sistem. Kot sistemski administrator in uničevalec je vaša naloga, da Billu preprečite njegovo nalogo.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>Zgodba o KBill</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>Pravila za KBill</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;PRAVILA&lt;/b&gt;&lt;p&gt;kBill je bil načrtovan z mislimi na lahko uporabo. Po nekaj letih beta testiranja z najcenejšim vmesnikom je pripeljalo do igre ki je enostavna.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Pretepi Bille(klikni)&lt;/LI&gt;&lt;LI&gt;Resetiraj računalnik (klikni)&lt;/LI&gt;&lt;LI&gt;Poberi ukradene OSe &amp; vrni (prenesi) na njihov pravi računalnik&lt;/LI&gt;&lt;LI&gt;Prenesi koš v iskre&lt;/LI&gt;&lt;LI&gt;Točkovanje je osnovano na skupnem času, ko sistemi delujejo in bonusi za ubite Bille&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;Vse drugo lahko sami naredite. Mi smo naredili, torej ne more biti težko</translation>
     </message>
     <message>
diff --git a/i18n/sl/keypebble.ts b/i18n/sl/keypebble.ts
index 578b33e..86a1ad5 100644
--- a/i18n/sl/keypebble.ts
+++ b/i18n/sl/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>Napak branja: QSocket je prijavil napako pri branju
 podatkov, oddaljeni gostitelj je verjetno prekinil
 povezavo.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket je prijavil neveljavno kodo napake</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">Čakam na zagon strežnika...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>Čakam na ime omizja...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>Povezan z %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>Napaka protokola: Sporočilo %1 je bilo najdeno pri pričakovanju posodobitvenega sporočila.</translation>
     </message>
     <message>
diff --git a/i18n/sl/kpacman.ts b/i18n/sl/kpacman.ts
index 1733255..1a3ca93 100644
--- a/i18n/sl/kpacman.ts
+++ b/i18n/sl/kpacman.ts
@@ -86,34 +86,24 @@ od Michel Filippi (mfilippi@sade.rhein-main.de).
 Na obliko je močno vplival pacman
 (c) 1980 MIDWAY MFG.CO.
 
 Rad bi se zahvalil svoji punci Elke Krueers za
 10 letno prijateljstvo.
 </translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
-        <source>Configuration Error</source>
-        <translation type="obsolete">Napaka pri nastavitvah</translation>
-    </message>
-    <message>
-        <source>There are no schemes defined,
-or no scheme is selected.</source>
-        <translation type="obsolete">Nobena shema ni definirana
-ali pa ni nobena izbrana.</translation>
-    </message>
-    <message>
         <source>KPacman</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>KpacmanWidget</name>
     <message>
         <source>The bitfont could not be contructed.
 
 The file &apos;@FONTNAME@&apos; does not exist,
 or is of an unknown format.</source>
         <translation>Bitpisava ne more biti uporabljena.
diff --git a/i18n/sl/launchersettings.ts b/i18n/sl/launchersettings.ts
index 75aa37e..4e8f030 100644
--- a/i18n/sl/launchersettings.ts
+++ b/i18n/sl/launchersettings.ts
@@ -98,39 +98,24 @@
         <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>
@@ -218,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/sl/libbatteryapplet.ts b/i18n/sl/libbatteryapplet.ts
index 6e4576c..ff53425 100644
--- a/i18n/sl/libbatteryapplet.ts
+++ b/i18n/sl/libbatteryapplet.ts
@@ -33,56 +33,36 @@
         <source>On backup power</source>
         <translation>Na pomožnem napajanju</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>Napajanje priklopljeno</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>Zunanje napajanje odklopljeno</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Čas baterije do konca</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="obsolete">Zapri</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">Status baterije</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>Napaka</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>ne morem odpreti datoteke</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>Polnim obe napravi</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">Delež ostanka baterije:</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">Preostali čas baterije:</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>Baterija ni vstavljena</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/libliquid.ts b/i18n/sl/libliquid.ts
index cdb6ae1..0a2fe89 100644
--- a/i18n/sl/libliquid.ts
+++ b/i18n/sl/libliquid.ts
@@ -1,75 +1,68 @@
 <!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 type="unfinished">Stil Liquid</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">Brez translucence</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">Črtasto, barva ozadja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">Črtasto, barva gumba</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">Transculentno črtasto, barva ozadja</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">Transculentno črtasto, barva gumba</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">Nastavljena translucenca</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">Barva menujev</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">Barva besedila</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">Preliv</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">Uporabi senčeno besedilo v menujih</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">Naj se orodni gumb pojavi ploščat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">Črtast kontrast</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">Liquid</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">High Performance Liquid stil od Mosfeta</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/libopieobex.ts b/i18n/sl/libopieobex.ts
index cb21255..b1f483e 100644
--- a/i18n/sl/libopieobex.ts
+++ b/i18n/sl/libopieobex.ts
@@ -1,62 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ObexDlg</name>
-    <message>
-        <source>OBEX Sending</source>
-        <translation type="obsolete">OBEX pošilja</translation>
-    </message>
-    <message>
-        <source>Sending:</source>
-        <translation type="obsolete">Pošiljam:</translation>
-    </message>
-    <message>
-        <source>filename</source>
-        <translation type="obsolete">Ime datoteke</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Prekliči</translation>
-    </message>
-</context>
-<context>
-    <name>ObexInc</name>
-    <message>
-        <source>OBEX Receiving</source>
-        <translation type="obsolete">Obex sprejema</translation>
-    </message>
-    <message>
-        <source>TextLabel1</source>
-        <translation type="obsolete">TextLabel1</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation type="obsolete">Ime datoteke</translation>
-    </message>
-    <message>
-        <source>A file was beamed 
-to you.</source>
-        <translation type="obsolete">Datoteka je bila prežarčena
-k vam.</translation>
-    </message>
-    <message>
-        <source>Insert</source>
-        <translation type="obsolete">Vstavi</translation>
-    </message>
-    <message>
-        <source>Reject</source>
-        <translation type="obsolete">Zavrni</translation>
-    </message>
-</context>
-<context>
     <name>OpieObex::OtherHandler</name>
     <message>
         <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
         <translation type="unfinished">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
     </message>
     <message>
         <source>Accept</source>
         <translation type="unfinished">Sprejmi</translation>
     </message>
     <message>
         <source>Deny</source>
         <translation type="unfinished">Zavrni</translation>
@@ -112,87 +64,13 @@ k vam.</translation>
         <source>Try %1</source>
         <translation type="unfinished">Probaj %1</translation>
     </message>
     <message>
         <source>Search again for IrDa.</source>
         <translation type="unfinished">Ponovno išči IrDa.</translation>
     </message>
     <message>
         <source>Start sending</source>
         <translation type="unfinished">Začni pošiljati</translation>
     </message>
 </context>
-<context>
-    <name>OtherHandler</name>
-    <message>
-        <source>&lt;qt&gt;&lt;b&gt;Received:&lt;/b&gt;&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;&lt;b&gt;Sprejeto:&lt;/b&gt;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Accept</source>
-        <translation type="obsolete">Sprejmi</translation>
-    </message>
-    <message>
-        <source>Deny</source>
-        <translation type="obsolete">Zavrni</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You received a file of type %1 (&lt;img src=&quot;%2&quot;&gt; )What do you want to do?</source>
-        <translation type="obsolete">&lt;p&gt;Sprejeli ste datoteko tipa %1 (&lt;img src=&quot;%2&quot;&gt; ) Kaj želite narediti?</translation>
-    </message>
-</context>
-<context>
-    <name>SendWidget</name>
-    <message>
-        <source>&lt;qt&gt;&lt;h1&gt;Sending:&lt;/h1&gt;&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;&lt;h1&gt;Pošiljam:&lt;/h1&gt;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation type="obsolete">Končano</translation>
-    </message>
-    <message>
-        <source>IrDa is not enabled!</source>
-        <translation type="obsolete">IrDa ni vklopljen!</translation>
-    </message>
-    <message>
-        <source>Searching for IrDa Devices.</source>
-        <translation type="obsolete">Iščem IrDa naprave.</translation>
-    </message>
-    <message>
-        <source>Bluetooth is not available</source>
-        <translation type="obsolete">Bluetooth ni na voljo</translation>
-    </message>
-    <message>
-        <source>Searching for bluetooth Devices.</source>
-        <translation type="obsolete">Iščem bluetooth naprave.</translation>
-    </message>
-    <message>
-        <source>Scheduling for beam.</source>
-        <translation type="obsolete">Razvrščam za prežarčenje.</translation>
-    </message>
-    <message>
-        <source>Click to beam</source>
-        <translation type="obsolete">Klikni za prežarčenje</translation>
-    </message>
-    <message>
-        <source>Sent</source>
-        <translation type="obsolete">Poslano</translation>
-    </message>
-    <message>
-        <source>Failure</source>
-        <translation type="obsolete">Napaka</translation>
-    </message>
-    <message>
-        <source>Try %1</source>
-        <translation type="obsolete">Probaj %1</translation>
-    </message>
-    <message>
-        <source>Search again for IrDa.</source>
-        <translation type="obsolete">Ponovno išči IrDa.</translation>
-    </message>
-    <message>
-        <source>Start sending</source>
-        <translation type="obsolete">Začni pošiljati</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/sl/libopiepim2.ts b/i18n/sl/libopiepim2.ts
index 0b79882..7c9eb29 100644
--- a/i18n/sl/libopiepim2.ts
+++ b/i18n/sl/libopiepim2.ts
@@ -207,178 +207,24 @@ and </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>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Ponavljajoč dogodek
-</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Brez</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dan</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Teden</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mesec</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Leto</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Vasak:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Pogostost</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Konča na:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Brez končnega datuma</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ponovi na</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sre</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Čet</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pet</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Ned</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Vsak</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Spremenljivka1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Spremenljivka 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">Tedenskaspremenljivka</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Brez končnega datuma</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ponovi na</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sre</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Čet</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pet</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Ned</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dan</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Vsak</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Čas:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Izberi čas:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/sl/libopieui2.ts b/i18n/sl/libopieui2.ts
index c4de84f..a14a21a 100644
--- a/i18n/sl/libopieui2.ts
+++ b/i18n/sl/libopieui2.ts
@@ -1,153 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Ponavljajoč dogodek
-</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Brez</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dan</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">Teden</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">Mesec</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">Leto</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">Vasak:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">Pogostost</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">Konča na:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Brez končnega datuma</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ponovi na</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sre</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Čet</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pet</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Ned</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">Vsak</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">Spremenljivka1</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Spremenljivka 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">Tedenskaspremenljivka</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">Brez končnega datuma</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">Ponovi na</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">Pon</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">Tor</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">Sre</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">Čet</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">Pet</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">Sob</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">Ned</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">Dan</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">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>
@@ -290,28 +151,24 @@
         <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>Every</source>
-        <translation type="obsolete">Vsak</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">Brez</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/sl/libqpe.ts b/i18n/sl/libqpe.ts
index 6750ab1..944b0a9 100644
--- a/i18n/sl/libqpe.ts
+++ b/i18n/sl/libqpe.ts
@@ -185,28 +185,24 @@ ureja kategorije.</translation>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>Niz ni najden.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">Prišel na konec, začenjam na začetku</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>Najdi</translation>
     </message>
     <message>
@@ -443,62 +439,48 @@ Please free up some space
 before entering data</source>
         <translation>Ne morem ustvariti zagonskih datotek
 Prosim sprostite nekaj prostora
 preden vnašate podatke</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>Ne morem izvršiti alarma.
 Sprostite nekaj spomina in poizkusite ponovno.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>L</translation>
     </message>
     <message>
         <source>day</source>
         <translation>dan</translation>
     </message>
     <message>
         <source>month</source>
         <translation>mesec</translation>
     </message>
     <message>
         <source>year</source>
         <translation>leto</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>PM</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>AM</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">Ste prepričani, da želite izbrisati
-%1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>vse</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>Neizpolnjeno</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;Delovni naslov&lt;/b&gt;</translation>
     </message>
     <message>
@@ -781,44 +763,24 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
         <source>Fri</source>
         <translation>Pet</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>Sob</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>Ned</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="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>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;Qt&gt;Pomoč ni na voljo za ta program, ima pa majhno pomol.&lt;p&gt;Da bi to uporabili:&lt;p&gt;&lt;ol&gt;&lt;li&gt;kliknite in zadržite gumb za pomoč.&lt;li&gt;kose prikaže naslovna vrstica &lt;b&gt;Kaj je to...&lt;/b&gt;, kliknite na katerokoli od kontrol.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">Kaj je to...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -862,79 +824,60 @@ Sprostite nekaj spomina in poizkusite ponovno.</translation>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">Napaka</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">D</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
     <message>
         <source>%1 document</source>
         <translation>%1 dokument</translation>
     </message>
     <message>
         <source>Please wait...</source>
         <translation type="unfinished"></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="unfinished">Kliknite tu, da zaprete to okno in zanemarite spremembe.</translation>
     </message>
     <message>
         <source>Click to close this window.</source>
         <translation type="unfinished">Kliknite tu, da zaprete to okno.</translation>
     </message>
     <message>
         <source>Click to close this window and apply changes.</source>
         <translation type="unfinished">Kliknite tu, da zaprete to okno in uveljavite spremembe.</translation>
     </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="unfinished">Kliknite tu, da to okno uporablja ves prostor, ki je na voljo.</translation>
     </message>
     <message>
         <source>Click to make this window movable.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/libwlan.ts b/i18n/sl/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/sl/libwlan.ts
+++ b/i18n/sl/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/sl/mindbreaker.ts b/i18n/sl/mindbreaker.ts
index e451a38..d7b537b 100644
--- a/i18n/sl/mindbreaker.ts
+++ b/i18n/sl/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>zmage pov.: %1 prehodov (%2 iger)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">Gre%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">TrenutnGre%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">Odgovor%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>Zbriši statistiko</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>Zbriši zmagovalno razmerje?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>Vredu</translation>
     </message>
     <message>
diff --git a/i18n/sl/minesweep.ts b/i18n/sl/minesweep.ts
index d1e42d5..46ea4a8 100644
--- a/i18n/sl/minesweep.ts
+++ b/i18n/sl/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>Zmagali ste!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>Eksplodirali ste!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">Minolovec</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>Začetnik</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>Napreden</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>Strokovnjak</translation>
     </message>
     <message>
diff --git a/i18n/sl/opie-eye.ts b/i18n/sl/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/sl/opie-eye.ts
+++ b/i18n/sl/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/opiemail.ts b/i18n/sl/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/sl/opiemail.ts
+++ b/i18n/sl/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/sl/patience.ts b/i18n/sl/patience.ts
index ecc3a09..d3124b2 100644
--- a/i18n/sl/patience.ts
+++ b/i18n/sl/patience.ts
@@ -5,68 +5,44 @@
         <source>Patience</source>
         <translation>Pasjansa</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;Igra</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;Zamenjaj zadnjo stran kart</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">Z&amp;askoči na položaj</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Nastavitve</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;O</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoč</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>Igraj</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">Zamenjaj zadnje strani kart</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">Zaskoči na položaj</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">Obrni eno karto</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>Nastavitve</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">Obrni tri karte</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
diff --git a/i18n/sl/qpe.ts b/i18n/sl/qpe.ts
index c6bd0fd..3ae362a 100644
--- a/i18n/sl/qpe.ts
+++ b/i18n/sl/qpe.ts
@@ -393,33 +393,21 @@ immediately.</source>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">Sinhroniziram</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Kontakti&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;Prekliči</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/security.ts b/i18n/sl/security.ts
index c6a0cab..fc5003c 100644
--- a/i18n/sl/security.ts
+++ b/i18n/sl/security.ts
@@ -65,48 +65,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">Sinhroniziraj</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">Karkoli</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,144 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">Nastavi kodo</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Zamenjaj kodo</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">Vpišite kodo</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">Koda ni pravilna</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">Vpisana koda ni pravilna.
-Dostop zavrnjen</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Karkoli</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">Brez</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">Varnostne nastavitve</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">Zamenjaj kodo</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">Zbriši kodo</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">Potrebna koda pri vklopu</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">Sinhroniziraj</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">Sperjmi sinhronizacijo iz mreže:</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">Karkoli</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">brez</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;Koda prinaša minimalno zaščito za varovanje vaše naprave.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (privzeto)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">Sinhroniziraj</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">Sperjmi sinhronizacijo iz mreže:</translation>
diff --git a/i18n/sl/snake.ts b/i18n/sl/snake.ts
index 6eae0c1..df654ed 100644
--- a/i18n/sl/snake.ts
+++ b/i18n/sl/snake.ts
@@ -13,39 +13,31 @@
         <source>SNAKE!</source>
         <translation>KAČA!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>Uporabite smerne tipke za vodenje
 kače, da poje miš. Ne smete se
 zabiti v steno, robove ali svoj rep.</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">Pritisnite karkoli za začetek</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>    Točke:    %1</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>KONEC IGRE!
 Vaše točke: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">Pritisnite karkoli za začetek nove igre.</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/sl/sysinfo.ts b/i18n/sl/sysinfo.ts
index 818bf2e..26d82e8 100644
--- a/i18n/sl/sysinfo.ts
+++ b/i18n/sl/sysinfo.ts
@@ -171,28 +171,24 @@ Memory is categorized as follows:
         <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>
diff --git a/i18n/sl/tableviewer.ts b/i18n/sl/tableviewer.ts
index 302af4d..f65fb4c 100644
--- a/i18n/sl/tableviewer.ts
+++ b/i18n/sl/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() Ne uspem narediti privzete vrednosti za tip %1, ključ ni dodan.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) Ne najdem veljavnega tipa</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>Ponastavi</translation>
     </message>
     <message>
         <source>key</source>
         <translation>ključ</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/sl/todolist.ts b/i18n/sl/todolist.ts
index 4cc15ae..30a500c 100644
--- a/i18n/sl/todolist.ts
+++ b/i18n/sl/todolist.ts
@@ -80,164 +80,104 @@
     <message>
         <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New Task</source>
-        <translation type="obsolete">Novo opravilo</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">Uredi opravilo</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">Poglej opravila</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">Izbriši...</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">Izbriši vse...</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">Prežarči</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Najdi</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">Podatki</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorija</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">Izbire</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">Vse kategorije</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="unfinished">Zmanjkalo prostora</translation>
     </message>
     <message>
         <source>Todo was unable
 to save your changes.
 Free up some space
 and try again.
 
 Quit Anyway?</source>
         <translation type="unfinished">Ne uspem
 shraniti vaših sprememb.
 Sprostite nekaj prostora
 in poizkusite ponovno.
 
 Izhod?</translation>
     </message>
     <message>
         <source>Todo</source>
         <translation type="unfinished">Opravki</translation>
     </message>
     <message>
-        <source>Can not edit data, currently syncing</source>
-        <translation type="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="obsolete">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="obsolete">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="obsolete">Opis</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation type="unfinished">Rok</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Template Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/sl/zsafe.ts b/i18n/sl/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/sl/zsafe.ts
+++ b/i18n/sl/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/xx/addressbook.ts b/i18n/xx/addressbook.ts
index 6136089..38625b7 100644
--- a/i18n/xx/addressbook.ts
+++ b/i18n/xx/addressbook.ts
@@ -19,88 +19,24 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>List</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The selected file 
  does not end with &quot;.vcf&quot;.
  Do you really want to open it?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>FOO</translation>
@@ -118,28 +54,24 @@
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;All Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Can not edit data, currently syncing</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Edit My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Contacts - My Personal Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -150,40 +82,28 @@ and try again.
 Quit anyway?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Not Found</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to find a contact for this search pattern!</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Cards</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Export vCard</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>You have to select a contact !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You have to set a filename !</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Contact</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1374,180 +1294,13 @@ is provided free !</source>
         <source>Export vCard</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/xx/advancedfm.ts b/i18n/xx/advancedfm.ts
index 9b2d737..0f6c2bd 100644
--- a/i18n/xx/advancedfm.ts
+++ b/i18n/xx/advancedfm.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>AdvancedFm</name>
     <message>
         <source>Note</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Show Hidden Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Execute</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -113,150 +109,84 @@
         <source>Date</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>2</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete Directory?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Copy </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> As</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>AdvancedFm Output</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advancedfm 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> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>%1 exists. Ok to overwrite?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Could not copy %1 to %2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Bookmark Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Cannot remove current directory
-from bookmarks.
-It is not bookmarked!</source>
-        <translation type="obsolete">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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Really delete
-%1?</source>
-        <translation type="obsolete">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>Switch to View 1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/appearance.ts b/i18n/xx/appearance.ts
index 50fb682..51f00f9 100644
--- a/i18n/xx/appearance.ts
+++ b/i18n/xx/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -73,64 +61,44 @@
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">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>
@@ -153,50 +121,24 @@ Click here to select an available scheme.</source>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here so that tabs appear at the top of the window.</source>
         <translation>FOO</translation>
     </message>
diff --git a/i18n/xx/aqpkg.ts b/i18n/xx/aqpkg.ts
index ef6a66e..b4c53fa 100644
--- a/i18n/xx/aqpkg.ts
+++ b/i18n/xx/aqpkg.ts
@@ -193,56 +193,24 @@
         <source>Couldn&apos;t open status file - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t create tempory status file - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Couldn&apos;t start ipkg process</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Could not open :</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Creating directory </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Linked %1 to %2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Failed to link %1 to %2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Removed %1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Failed to remove %1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Removed </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Failed to remove </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Couldn&apos;t start ipkg-link process</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking failed!
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Symbolic linking succeeded.
 </source>
         <translation type="unfinished"></translation>
@@ -489,41 +457,33 @@ Are you sure?
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove or ReInstall</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>ReInstall</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>R</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Do you wish to remove or upgrade
 %1?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Remove or Upgrade</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>U</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Updating Launcher...</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>PackageWindow</name>
     <message>
         <source>&lt;b&gt;Description&lt;/b&gt; - </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;&lt;b&gt;Installed To&lt;/b&gt; - </source>
diff --git a/i18n/xx/backup.ts b/i18n/xx/backup.ts
index 4704287..4f89738 100644
--- a/i18n/xx/backup.ts
+++ b/i18n/xx/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Message</source>
         <translation>FOO</translation>
     </message>
@@ -26,44 +22,36 @@
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Details</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup and Restore.. Failed !!</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Backup Successfull.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Please select something to restore.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore Failed.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to open File: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Restore Successfull.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Backup Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore Successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backing up...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -97,52 +85,44 @@
         <source>Backup And Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Column 1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Restore</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Update Filelist</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Locations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/calculator.ts b/i18n/xx/calculator.ts
index ca8c6a9..66f866b 100644
--- a/i18n/xx/calculator.ts
+++ b/i18n/xx/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -123,28 +119,24 @@
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
         <source>Standard</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/xx/calibrate.ts b/i18n/xx/calibrate.ts
index 3e30b62..36aaa19 100644
--- a/i18n/xx/calibrate.ts
+++ b/i18n/xx/calibrate.ts
@@ -1,14 +1,10 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/xx/checkbook.ts b/i18n/xx/checkbook.ts
index 365228d..10dd1b4 100644
--- a/i18n/xx/checkbook.ts
+++ b/i18n/xx/checkbook.ts
@@ -37,48 +37,24 @@
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Checking</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>CD</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Money market</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mutual fund</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Other</source>
-        <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>
@@ -101,32 +77,24 @@
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>This area shows the current balance in this checkbook.</source>
-        <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>
@@ -183,28 +151,24 @@ To sort entries by a specific field, click on the column name.</source>
         <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 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>
@@ -631,105 +595,37 @@ The value entered should always be positive.</source>
 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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Bills</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>CDs</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Clothing</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Computer</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>DVDs</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Eletronics</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Entertainment</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Food</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Gasoline</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Misc</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Movies</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Rent</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Travel</source>
-        <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Family Member</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Misc. Credit</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Automatic Payment</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Cash</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/clock.ts b/i18n/xx/clock.ts
index fd365e7..8f88d47 100644
--- a/i18n/xx/clock.ts
+++ b/i18n/xx/clock.ts
@@ -31,76 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Alarm set: %1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -234,53 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/xx/datebook.ts b/i18n/xx/datebook.ts
index bd12869..8dc1ec4 100644
--- a/i18n/xx/datebook.ts
+++ b/i18n/xx/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <message>
         <source>Office</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Category:</source>
         <translation>FOO</translation>
     </message>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</source>
+        <translation type="unfinished"></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>
@@ -401,59 +409,24 @@ Quit anyway?</source>
     </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>
-        <comment>Friday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sa</source>
-        <comment>Saturday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Su</source>
-        <comment>Sunday</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>DateEntry</name>
     <message>
         <source>Start Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>End Time</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -566,28 +539,24 @@ Quit anyway?</source>
     <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="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>
diff --git a/i18n/xx/embeddedkonsole.ts b/i18n/xx/embeddedkonsole.ts
index 369837b..fbb06e6 100644
--- a/i18n/xx/embeddedkonsole.ts
+++ b/i18n/xx/embeddedkonsole.ts
@@ -1,118 +1,66 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>CommandEditDialog</name>
     <message>
         <source>Command Selection</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>new</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>edit</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>delete</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>up</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>down</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>CommandEditDialogBase</name>
     <message>
         <source>Commands</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;B&gt;Commands&lt;/B&gt;:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Command List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -127,36 +75,28 @@
         <source>Blue on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Amber on Black</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Custom</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Font</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Colors</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Options</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -171,28 +111,24 @@
         <source>Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Paste</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/fifteen.ts b/i18n/xx/fifteen.ts
index e73fa2b..5bfbcd0 100644
--- a/i18n/xx/fifteen.ts
+++ b/i18n/xx/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/formatter.ts b/i18n/xx/formatter.ts
index 53f97fe..e1cf794 100644
--- a/i18n/xx/formatter.ts
+++ b/i18n/xx/formatter.ts
@@ -13,70 +13,49 @@
         <source>File Systems</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>FOO</translation>
     </message>
@@ -110,49 +89,36 @@ Device is busy!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No such device!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Available: %1 kB ( %d mB)</source>
         <translation>FOO</translation>
diff --git a/i18n/xx/go.ts b/i18n/xx/go.ts
index 3bd9809..41de802 100644
--- a/i18n/xx/go.ts
+++ b/i18n/xx/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/xx/kbill.ts b/i18n/xx/kbill.ts
index 351c1fb..cfeacd3 100644
--- a/i18n/xx/kbill.ts
+++ b/i18n/xx/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/keypebble.ts b/i18n/xx/keypebble.ts
index def7bba..695ada5 100644
--- a/i18n/xx/keypebble.ts
+++ b/i18n/xx/keypebble.ts
@@ -18,28 +18,24 @@
 data, the remote host has probably dropped the
 connection.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/launchersettings.ts b/i18n/xx/launchersettings.ts
index f027dd7..c56d24d 100644
--- a/i18n/xx/launchersettings.ts
+++ b/i18n/xx/launchersettings.ts
@@ -203,52 +203,44 @@
         <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 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 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>
diff --git a/i18n/xx/libbatteryapplet.ts b/i18n/xx/libbatteryapplet.ts
index d3a994e..ba37eb5 100644
--- a/i18n/xx/libbatteryapplet.ts
+++ b/i18n/xx/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -41,52 +33,36 @@
         <source>On backup power</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Battery status</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Percentage battery remaining: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Battery time remaining: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>No jacket with battery inserted</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>no data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Jacket  </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/libclockapplet.ts b/i18n/xx/libclockapplet.ts
index 7ac03b7..bd02d12 100644
--- a/i18n/xx/libclockapplet.ts
+++ b/i18n/xx/libclockapplet.ts
@@ -1,25 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>LauncherClock</name>
     <message>
-        <source>Information</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Set time...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clock..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Alarm...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/libliquid.ts b/i18n/xx/libliquid.ts
index 4df7a86..d42dee4 100644
--- a/i18n/xx/libliquid.ts
+++ b/i18n/xx/libliquid.ts
@@ -1,75 +1,68 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, button color</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, background color</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Translucent stippled, button color</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom translucency</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu color</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opacity</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use shadowed menu text</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Make toolbar buttons appear flat</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stipple contrast</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Styles</name>
     <message>
         <source>Liquid</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>High Performance Liquid style by Mosfet</source>
-        <translation type="unfinished">FOO</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libopiepim2.ts b/i18n/xx/libopiepim2.ts
index 61c5add..0b06eea 100644
--- a/i18n/xx/libopiepim2.ts
+++ b/i18n/xx/libopiepim2.ts
@@ -1,164 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>OPimRecurrenceBase</name>
     <message>
         <source>Repeating Event </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Day</source>
         <translation type="unfinished">FOO</translation>
@@ -356,254 +206,24 @@ and </source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>year(s)</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Every</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
@@ -657,54 +277,24 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to set your preferences for this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to filter items by category.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>Opie::Ui::OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
         <source>Description:</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Priority:</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Progress:</source>
         <translation>FOO</translation>
@@ -713,56 +303,48 @@ and </source>
         <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>
     </message>
     <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Home Web Page: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Phone: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Home Fax: </source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -837,28 +419,24 @@ and </source>
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Every </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Monday</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Tuesday</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -873,36 +451,24 @@ and </source>
         <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>Documents</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Files</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>All Files</source>
-        <translation type="obsolete">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>
@@ -917,32 +483,24 @@ and </source>
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <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>
diff --git a/i18n/xx/libopieui2.ts b/i18n/xx/libopieui2.ts
index 47149da..a6f9c13 100644
--- a/i18n/xx/libopieui2.ts
+++ b/i18n/xx/libopieui2.ts
@@ -1,417 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Button</name>
-    <message>
-        <source>Calendar Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Contacts Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Menu Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mail Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Record Button</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Display Rotate</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Up</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Down</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Right</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Lower+Left</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Up</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Down</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Right</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Upper+Left</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OColorDialog</name>
-    <message>
-        <source>Hue:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sat:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Val:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Red:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Green:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Blue:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Alpha channel:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Select color</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OColorPopupMenu</name>
-    <message>
-        <source>More</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>More...</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFileDialog</name>
-    <message>
-        <source>FileDialog</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFileSelector</name>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFontMenu</name>
-    <message>
-        <source>Large</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Medium</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OFontSelector</name>
-    <message>
-        <source>Style</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The Quick Brown Fox Jumps Over The Lazy Dog</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>OKeyConfigWidget</name>
-    <message>
-        <source>Name</source>
-        <comment>Name of the Action in the ListView Header</comment>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Var1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>days</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>day</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>weeks</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>week</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>months</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>month</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>years</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>year</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> and </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>,
-and </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>, and </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>No Repeat</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>day(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>week(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Repeat By</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>month(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>year(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>on </source>
-        <translation type="obsolete">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>
@@ -540,305 +137,39 @@ and </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Opie::Ui::Private::OFileViewFileListView</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Mime Type</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>QObject</name>
     <message>
-        <source>Description:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Priority:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Progress:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Deadline:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Category:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Default Email: </source>
-        <translation type="obsolete">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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Web Page: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Phone: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Fax: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Mobile: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Business Pager: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Web Page: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Phone: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Fax: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Home Mobile: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>All Emails: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Profession: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Assistant: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Manager: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Male</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Female</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Gender: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Spouse: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Birthday: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Anniversary: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Children: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Nickname: </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Notes:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Start:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>End:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Note:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>%1 %2 every </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The %1 every </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The %1 %1 of every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Every </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Monday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Tuesday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Wednesday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Thursday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Friday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Saturday</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sunday</source>
-        <translation type="obsolete">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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>High</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Normal</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Low</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Very low</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Location:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>This is an all day event</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>This is a multiple day event</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Work Address:&lt;/b&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;br&gt;&lt;br&gt;&lt;b&gt;Home Address:&lt;/b&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The %1 %2 of every</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Directories</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All Directories</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QWidget</name>
-    <message>
-        <source>st</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>nd</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>rd</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>th</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/xx/libqpe.ts b/i18n/xx/libqpe.ts
index 193d27d..b81e6a2 100644
--- a/i18n/xx/libqpe.ts
+++ b/i18n/xx/libqpe.ts
@@ -184,28 +184,24 @@ editing categories.</source>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -438,61 +434,48 @@ try again.</source>
     <message>
         <source>Unable to create start up files
 Please free up some space
 before entering data</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>day</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>month</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>year</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>PM</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>AM</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -771,44 +754,24 @@ Free some memory and try again.</source>
         <source>Fri</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation>FOO</translation>
     </message>
@@ -852,28 +815,24 @@ Free some memory and try again.</source>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/xx/libtodayaddressbookplugin.ts b/i18n/xx/libtodayaddressbookplugin.ts
index 9cf9b1a..184294a 100644
--- a/i18n/xx/libtodayaddressbookplugin.ts
+++ b/i18n/xx/libtodayaddressbookplugin.ts
@@ -1,44 +1,32 @@
 <!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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">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>
-    </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>
diff --git a/i18n/xx/libtodaydatebookplugin.ts b/i18n/xx/libtodaydatebookplugin.ts
index 524b0ce..e30a8e5 100644
--- a/i18n/xx/libtodaydatebookplugin.ts
+++ b/i18n/xx/libtodaydatebookplugin.ts
@@ -6,79 +6,24 @@
         <translation>FOO</translation>
     </message>
     <message>
         <source>note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All day</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatebookPluginConfig</name>
-    <message>
-        <source>Show location</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Check this if the location of an appointment should be shown for each one</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Show notes</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Check this if the note attached to an appointment should be shown for each one</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Show only later
- appointments</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Check this if only appointments later then current time should be shown</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>How many 
-appointment
-should be 
-shown?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>How many appointments should be shown maximal. In chronical order</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>How many more days</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>How many more days should be in the range</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> day(s)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>only today</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>DatebookPluginConfigBase</name>
     <message>
         <source>DatebookPluginConfigBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show location</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Check this if the location of an appointment should be shown for each one</source>
         <translation type="unfinished">FOO</translation>
diff --git a/i18n/xx/libtodaytodolistplugin.ts b/i18n/xx/libtodaytodolistplugin.ts
index 3819402..2a96399 100644
--- a/i18n/xx/libtodaytodolistplugin.ts
+++ b/i18n/xx/libtodaytodolistplugin.ts
@@ -28,32 +28,13 @@
         <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">FOO</translation>
     </message>
     <message>
         <source>Clip line after X chars</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
-<context>
-    <name>TodolistPluginConfig</name>
-    <message>
-        <source>tasks shown </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Set the maximum number of task that should be shown</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Clip line after X chars</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>After how many chars should be the info about the task be cut off</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/xx/libtodayweatherplugin.ts b/i18n/xx/libtodayweatherplugin.ts
index 22772b4..6855bd5 100644
--- a/i18n/xx/libtodayweatherplugin.ts
+++ b/i18n/xx/libtodayweatherplugin.ts
@@ -96,25 +96,21 @@ Pres: </source>
         <source>SE </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> KPH</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> MPH</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source> hPa</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source> Hg</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> kPa</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/libwlan.ts b/i18n/xx/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/xx/libwlan.ts
+++ b/i18n/xx/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/xx/mindbreaker.ts b/i18n/xx/mindbreaker.ts
index 859ae3a..03c8c79 100644
--- a/i18n/xx/mindbreaker.ts
+++ b/i18n/xx/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/minesweep.ts b/i18n/xx/minesweep.ts
index 60a4510..1d5f382 100644
--- a/i18n/xx/minesweep.ts
+++ b/i18n/xx/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/opie-console.ts b/i18n/xx/opie-console.ts
index 580f614..47ae22f 100644
--- a/i18n/xx/opie-console.ts
+++ b/i18n/xx/opie-console.ts
@@ -782,28 +782,24 @@
         <source>SynchronizedFile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Dialing number: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Failure</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Dialing the number failed.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Cancelling...</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Searching modem</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Initializing...</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -848,40 +844,24 @@
 </context>
 <context>
     <name>TerminalWidget</name>
     <message>
         <source>Terminal Type</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Color scheme</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Font size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>small</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>medium</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>large</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Line-break conversions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Inbound</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Outbound</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/opie-eye.ts b/i18n/xx/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/xx/opie-eye.ts
+++ b/i18n/xx/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/opie-login.ts b/i18n/xx/opie-login.ts
index 84e7eed..e23e642 100644
--- a/i18n/xx/opie-login.ts
+++ b/i18n/xx/opie-login.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">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>
@@ -40,51 +36,36 @@ accurately to calibrate your screen.</source>
 </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 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>
diff --git a/i18n/xx/opieirc.ts b/i18n/xx/opieirc.ts
index 095737b..9007173 100644
--- a/i18n/xx/opieirc.ts
+++ b/i18n/xx/opieirc.ts
@@ -64,28 +64,24 @@
         <source>Talking on channel</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>CTCP</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Query</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ping</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Version</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -125,116 +121,68 @@
     <message>
         <source>Previous Tab</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close Tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Nickname change of an unknown person</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> has quit </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source> changed topic to </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Received a CTCP VERSION from </source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -313,32 +261,24 @@
         <source>You left channel %1</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>%1 left channel %2</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Channel message with unknown channel %1</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You are now known as %1</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>%1 is now known as %2</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>%1 has quit (%2)</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Server %1 version %2 supports usermodes &apos;%3&apos; and channelmodes &apos;%4&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>There are %1 operators connected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -528,36 +468,28 @@ Real name: %4</source>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Port required</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Nickname required</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Realname required</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation>FOO</translation>
     </message>
@@ -588,28 +520,24 @@ comma separated list of channel
     <message>
         <source>Edit the currently selected server profile</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
-        <source>Connection to</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Server messages</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Connecting to</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/xx/opiemail.ts b/i18n/xx/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/xx/opiemail.ts
+++ b/i18n/xx/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/xx/opierec.ts b/i18n/xx/opierec.ts
index 6f26ffe..b7aeab1 100644
--- a/i18n/xx/opierec.ts
+++ b/i18n/xx/opierec.ts
@@ -28,72 +28,40 @@
         <source>Time</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Files</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Sample Rate</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>44100</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>32000</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>22050</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>16000</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>11025</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>8000</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Limit Size</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Unlimited</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>File Directory</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Bit Depth</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>16</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>In</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Out</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Options</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -102,57 +70,36 @@
     </message>
     <message>
         <source>Low Disk Space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>You are running low of
 recording space
 or a card isn&apos;t being recognized</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source> seconds</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Do you really want to &lt;font size=+2&gt;&lt;B&gt;DELETE&lt;/B&gt;&lt;/font&gt;
-the selected file?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not remove file.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Opierec</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Please select file to  play</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Note</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Could not open audio file.
 </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>FOO</translation>
     </message>
@@ -168,52 +115,32 @@ the selected file?</source>
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Location</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Wave Compression (smaller files)</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>auto Mute</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>mute</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Stop</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Auto Mute</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Del</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stereo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/osearch.ts b/i18n/xx/osearch.ts
index 6116587..69926e3 100644
--- a/i18n/xx/osearch.ts
+++ b/i18n/xx/osearch.ts
@@ -1,52 +1,28 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>OSearch</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>adressbook</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>todo</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>datebook</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>applications</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>documents</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Search</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Search all</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Case sensitiv</source>
-        <translation type="obsolete">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>
@@ -111,52 +87,36 @@
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>show past events</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>search in dates</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>File: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Link: </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Mimetype: </source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>search content</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>searching %1</source>
         <translation>FOO</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>
diff --git a/i18n/xx/oxygen.ts b/i18n/xx/oxygen.ts
index e4b0674..3de4e26 100644
--- a/i18n/xx/oxygen.ts
+++ b/i18n/xx/oxygen.ts
@@ -60,40 +60,28 @@
         <source>Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Weight</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Ionization Energy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Boiling point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/xx/patience.ts b/i18n/xx/patience.ts
index 2aef065..5fec3ab 100644
--- a/i18n/xx/patience.ts
+++ b/i18n/xx/patience.ts
@@ -17,68 +17,44 @@
         <source>Harp</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>&amp;Change card backs</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>&amp;Snap to position</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Change card backs</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/qpe.ts b/i18n/xx/qpe.ts
index 179b398..326712c 100644
--- a/i18n/xx/qpe.ts
+++ b/i18n/xx/qpe.ts
@@ -57,94 +57,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">FOO</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -192,32 +128,24 @@ Please charge the back-up battery.</source>
         <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>
@@ -234,107 +162,44 @@ Please charge the back-up battery.</source>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">FOO</translation>
@@ -368,31 +233,24 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -419,34 +277,24 @@ Please charge the back-up battery.</source>
 <context>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -507,80 +355,59 @@ immediately.</source>
         <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="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/security.ts b/i18n/xx/security.ts
index 616f2c6..8d02953 100644
--- a/i18n/xx/security.ts
+++ b/i18n/xx/security.ts
@@ -65,48 +65,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">FOO {192.168.129.0/24?}</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,151 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">FOO {192.168.129.0/24?}</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
         <source>Accept sync from network:</source>
         <translation type="unfinished">FOO</translation>
diff --git a/i18n/xx/snake.ts b/i18n/xx/snake.ts
index 0a0f3fd..6523a67 100644
--- a/i18n/xx/snake.ts
+++ b/i18n/xx/snake.ts
@@ -11,38 +11,30 @@
     </message>
     <message>
         <source>SNAKE!</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation>FOO</translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/xx/sysinfo.ts b/i18n/xx/sysinfo.ts
index c08c2d3..102486d 100644
--- a/i18n/xx/sysinfo.ts
+++ b/i18n/xx/sysinfo.ts
@@ -122,34 +122,24 @@
     <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 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>
@@ -181,63 +171,50 @@ Memory is categorized as follows:
         <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>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>You really want to execute %1 for this module?</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>You really want to execute
 %1 for this module?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
     <message>
         <source> : %1 kB</source>
         <translation>FOO</translation>
     </message>
     <message>
@@ -281,33 +258,24 @@ Click and hold on a process to see additional information about the process, or
         <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 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>
@@ -357,32 +325,24 @@ to this process?</source>
         <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 type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/xx/tableviewer.ts b/i18n/xx/tableviewer.ts
index ef3c9c2..22931c0 100644
--- a/i18n/xx/tableviewer.ts
+++ b/i18n/xx/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>key</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/xx/textedit.ts b/i18n/xx/textedit.ts
index 633e468..23db98e 100644
--- a/i18n/xx/textedit.ts
+++ b/i18n/xx/textedit.ts
@@ -145,29 +145,24 @@
         <source>Unnamed</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>No</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation>FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/tictac.ts b/i18n/xx/tictac.ts
index c81a74e..f2f3f63 100644
--- a/i18n/xx/tictac.ts
+++ b/i18n/xx/tictac.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>TicTac</source>
-        <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>
diff --git a/i18n/xx/today.ts b/i18n/xx/today.ts
index 37e7d76..db64675 100644
--- a/i18n/xx/today.ts
+++ b/i18n/xx/today.ts
@@ -9,36 +9,28 @@
         <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 type="obsolete">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>
-    <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The plugin &apos;%1&apos; caused Today to crash. It could be that the plugin is not properly installed.&lt;br&gt;Today tries to continue loading plugins.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayBase</name>
     <message>
         <source>Today</source>
@@ -63,81 +55,35 @@
         <source>Move Up</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>FOO</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>FOO</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Tiny Banner</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
         <translation type="unfinished">FOO</translation>
     </message>
     <message>
diff --git a/i18n/xx/todolist.ts b/i18n/xx/todolist.ts
index cb3ae28..f15cbff 100644
--- a/i18n/xx/todolist.ts
+++ b/i18n/xx/todolist.ts
@@ -1,24 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Ok</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>&lt;h1&gt;Alarm at %0&lt;/h1&gt;&lt;br&gt;</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>&lt;h1&gt;Alarm at %1&lt;/h1&gt;&lt;br&gt;</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">FOO</translation>
     </message>
 </context>
@@ -80,195 +76,107 @@
     <message>
         <source>Edit Task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>silent</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>loud</source>
         <translation>FOO</translation>
     </message>
-    <message>
-        <source>Opie Todolist</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to create a new task.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to modify the current task.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to remove the current task.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Beam</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Click here to send the current task to another device.</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo was unable
 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 type="obsolete">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 type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>C.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Deadline</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">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>
@@ -476,28 +384,24 @@ It allows you to quickly add a new task to your list.  This area can be shown or
         <source>Select category to organize this task with.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Recurring task</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Click here if task happens on a regular basis.  If selected, frequency can be set on the Recurrence tab.</source>
         <translation>FOO</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Enter any additional information about this task here.</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Todo List</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Summary:</source>
         <translation>FOO</translation>
     </message>
 </context>
diff --git a/i18n/xx/usermanager.ts b/i18n/xx/usermanager.ts
index 48bc9eb..fec39e0 100644
--- a/i18n/xx/usermanager.ts
+++ b/i18n/xx/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">FOO</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation>FOO</translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>FOO</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/xx/zsafe.ts b/i18n/xx/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/xx/zsafe.ts
+++ b/i18n/xx/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/zh_CN/datebook.ts b/i18n/zh_CN/datebook.ts
index fdfa81f..cb64e37 100644
--- a/i18n/zh_CN/datebook.ts
+++ b/i18n/zh_CN/datebook.ts
@@ -328,24 +328,32 @@ Quit anyway?</source>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
diff --git a/i18n/zh_CN/libliquid.ts b/i18n/zh_CN/libliquid.ts
index a60e040..410b29e 100644
--- a/i18n/zh_CN/libliquid.ts
+++ b/i18n/zh_CN/libliquid.ts
@@ -1,17 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_CN/libwlan.ts b/i18n/zh_CN/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/zh_CN/libwlan.ts
+++ b/i18n/zh_CN/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/zh_CN/opie-eye.ts b/i18n/zh_CN/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/zh_CN/opie-eye.ts
+++ b/i18n/zh_CN/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_CN/opiemail.ts b/i18n/zh_CN/opiemail.ts
index 99637a7..263f8b7 100644
--- a/i18n/zh_CN/opiemail.ts
+++ b/i18n/zh_CN/opiemail.ts
@@ -324,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -653,33 +705,30 @@ with that filter will be listed.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
+        <source>Click opens mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -723,24 +772,32 @@ with that filter will be listed.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -766,24 +823,28 @@ with that filter will be listed.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/zh_CN/zsafe.ts b/i18n/zh_CN/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/zh_CN/zsafe.ts
+++ b/i18n/zh_CN/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>
diff --git a/i18n/zh_TW/addressbook.ts b/i18n/zh_TW/addressbook.ts
index 689b51d..8c97bcc 100644
--- a/i18n/zh_TW/addressbook.ts
+++ b/i18n/zh_TW/addressbook.ts
@@ -19,131 +19,59 @@
     <message>
         <source>Unfiled</source>
         <translation type="unfinished">未歸檔</translation>
     </message>
 </context>
 <context>
     <name>AddressbookWindow</name>
     <message>
         <source>Contacts</source>
         <translation>聯絡人</translation>
     </message>
     <message>
-        <source>Contact</source>
-        <translation type="obsolete">聯絡人</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">新增</translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="obsolete">編輯</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">刪除</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">搜尋</translation>
-    </message>
-    <message>
-        <source>Write Mail To</source>
-        <translation type="obsolete">寫電郵給</translation>
-    </message>
-    <message>
-        <source>Beam Entry</source>
-        <translation type="obsolete">傳送項目</translation>
-    </message>
-    <message>
-        <source>My Personal Details</source>
-        <translation type="obsolete">個人資料</translation>
-    </message>
-    <message>
         <source>Can not edit data, currently syncing</source>
         <translation></translation>
     </message>
     <message>
         <source>Edit My Personal Details</source>
         <translation>編輯個人資料</translation>
     </message>
     <message>
-        <source>Edit Address</source>
-        <translation type="obsolete">編輯地址</translation>
-    </message>
-    <message>
         <source>Contacts - My Personal Details</source>
         <translation>聯絡人 - 個人資料&quot;</translation>
     </message>
     <message>
         <source>Out of space</source>
         <translation>儲存空間不足</translation>
     </message>
     <message>
         <source>Unable to save information.
 Free up some space
 and try again.
 
 Quit anyway?</source>
         <translation>無法儲存資料
 請先釋放些儲存空間後再試一次
 退出?
 </translation>
     </message>
     <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">未歸檔</translation>
-    </message>
-    <message>
-        <source>Import vCard</source>
-        <translation type="obsolete">輸入 cVard</translation>
-    </message>
-    <message>
-        <source>Close Find</source>
-        <translation type="obsolete">關閉搜尋</translation>
-    </message>
-    <message>
-        <source>Save all Data</source>
-        <translation type="obsolete">儲存所有資料</translation>
-    </message>
-    <message>
-        <source>Config</source>
-        <translation type="obsolete">設定</translation>
-    </message>
-    <message>
         <source>Not Found</source>
         <translation>未找到</translation>
     </message>
     <message>
-        <source>List</source>
-        <translation type="obsolete">列出</translation>
-    </message>
-    <message>
-        <source>Cards</source>
-        <translation type="obsolete">名片</translation>
-    </message>
-    <message>
-        <source>Card</source>
-        <translation type="obsolete">名片</translation>
-    </message>
-    <message>
-        <source>Start Search</source>
-        <translation type="obsolete">開始搜尋</translation>
-    </message>
-    <message>
         <source>Right file type ?</source>
         <translation>是正確檔案類型嘛?</translation>
     </message>
     <message>
         <source>&amp;Yes</source>
         <translation>&amp;是</translation>
     </message>
     <message>
         <source>&amp;No</source>
         <translation>&amp;否</translation>
     </message>
     <message>
@@ -1369,180 +1297,13 @@ is provided free !</source>
         <source>Export vCard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>My Personal Details</source>
         <translation type="unfinished">個人資料</translation>
     </message>
     <message>
         <source>Show quick search bar</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Business Phone</source>
-        <translation type="obsolete">公司電話號碼</translation>
-    </message>
-    <message>
-        <source>Business Fax</source>
-        <translation type="obsolete">公司傳真號碼</translation>
-    </message>
-    <message>
-        <source>Business Mobile</source>
-        <translation type="obsolete">公司手機號碼</translation>
-    </message>
-    <message>
-        <source>Default Email</source>
-        <translation type="obsolete">預設電郵地址</translation>
-    </message>
-    <message>
-        <source>Emails</source>
-        <translation type="obsolete">電子郵件</translation>
-    </message>
-    <message>
-        <source>Home Phone</source>
-        <translation type="obsolete">住家電話號碼</translation>
-    </message>
-    <message>
-        <source>Home Fax</source>
-        <translation type="obsolete">住家傳真號碼</translation>
-    </message>
-    <message>
-        <source>Home Mobile</source>
-        <translation type="obsolete">私人手機號碼</translation>
-    </message>
-    <message>
-        <source>Office</source>
-        <translation type="obsolete">公司</translation>
-    </message>
-    <message>
-        <source>Profession</source>
-        <translation type="obsolete">職業</translation>
-    </message>
-    <message>
-        <source>Assistant</source>
-        <translation type="obsolete">助理</translation>
-    </message>
-    <message>
-        <source>Manager</source>
-        <translation type="obsolete">經理</translation>
-    </message>
-    <message>
-        <source>Spouse</source>
-        <translation type="obsolete">配偶</translation>
-    </message>
-    <message>
-        <source>Gender</source>
-        <translation type="obsolete">性別</translation>
-    </message>
-    <message>
-        <source>Birthday</source>
-        <translation type="obsolete">生日</translation>
-    </message>
-    <message>
-        <source>Anniversary</source>
-        <translation type="obsolete">週年紀念日</translation>
-    </message>
-    <message>
-        <source>Nickname</source>
-        <translation type="obsolete">綽號</translation>
-    </message>
-    <message>
-        <source>Children</source>
-        <translation type="obsolete">子女</translation>
-    </message>
-    <message>
-        <source>Name Title</source>
-        <translation type="obsolete">名稱</translation>
-    </message>
-    <message>
-        <source>First Name</source>
-        <translation type="obsolete">名</translation>
-    </message>
-    <message>
-        <source>Middle Name</source>
-        <translation type="obsolete">中名</translation>
-    </message>
-    <message>
-        <source>Last Name</source>
-        <translation type="obsolete">姓</translation>
-    </message>
-    <message>
-        <source>Suffix</source>
-        <translation type="obsolete">Suffix</translation>
-    </message>
-    <message>
-        <source>File As</source>
-        <translation type="obsolete">歸檔為</translation>
-    </message>
-    <message>
-        <source>Job Title</source>
-        <translation type="obsolete">職稱</translation>
-    </message>
-    <message>
-        <source>Department</source>
-        <translation type="obsolete">部門</translation>
-    </message>
-    <message>
-        <source>Company</source>
-        <translation type="obsolete">公司</translation>
-    </message>
-    <message>
-        <source>Business Street</source>
-        <translation type="obsolete">公司所在街道名稱</translation>
-    </message>
-    <message>
-        <source>Business City</source>
-        <translation type="obsolete">公司所在城市名稱</translation>
-    </message>
-    <message>
-        <source>Business State</source>
-        <translation type="obsolete">公司所在州名</translation>
-    </message>
-    <message>
-        <source>Business Zip</source>
-        <translation type="obsolete">公司郵遞區號</translation>
-    </message>
-    <message>
-        <source>Business Country</source>
-        <translation type="obsolete">公司所在國家名稱</translation>
-    </message>
-    <message>
-        <source>Business Pager</source>
-        <translation type="obsolete">公司呼叫器號碼</translation>
-    </message>
-    <message>
-        <source>Business WebPage</source>
-        <translation type="obsolete">公司網頁</translation>
-    </message>
-    <message>
-        <source>Home Street</source>
-        <translation type="obsolete">住家所在街道名稱</translation>
-    </message>
-    <message>
-        <source>Home City</source>
-        <translation type="obsolete">住家所在城市名稱</translation>
-    </message>
-    <message>
-        <source>Home State</source>
-        <translation type="obsolete">住家所在州名</translation>
-    </message>
-    <message>
-        <source>Home Zip</source>
-        <translation type="obsolete">住家郵遞區號</translation>
-    </message>
-    <message>
-        <source>Home Country</source>
-        <translation type="obsolete">住家所在國家名稱</translation>
-    </message>
-    <message>
-        <source>Home Web Page</source>
-        <translation type="obsolete">個人網頁</translation>
-    </message>
-    <message>
-        <source>Notes</source>
-        <translation type="obsolete">備註</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/zh_TW/advancedfm.ts b/i18n/zh_TW/advancedfm.ts
index 90b925f..63d30ff 100644
--- a/i18n/zh_TW/advancedfm.ts
+++ b/i18n/zh_TW/advancedfm.ts
@@ -61,28 +61,24 @@
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Note</source>
         <translation>注意</translation>
     </message>
     <message>
         <source>Could not rename</source>
         <translation>無法重新命名</translation>
     </message>
     <message>
-        <source>That directory does not exist</source>
-        <translation type="obsolete">該目錄不存在</translation>
-    </message>
-    <message>
         <source>Copy As</source>
         <translation>複製為</translation>
     </message>
     <message>
         <source>AdvancedFm Output</source>
         <translation>進階檔案管理程式輸出</translation>
     </message>
     <message>
         <source>Advancedfm Beam out</source>
         <translation>進階檔案管理程式紅外線輸出</translation>
     </message>
     <message>
@@ -137,92 +133,44 @@
         <source>Copy </source>
         <translation type="unfinished">複製 </translation>
     </message>
     <message>
         <source> As</source>
         <translation type="unfinished"> 為</translation>
     </message>
     <message>
         <source>Copy Same Dir</source>
         <translation>複製相同的目錄</translation>
     </message>
     <message>
-        <source>Could not copy
-</source>
-        <translation type="obsolete">無法複製</translation>
-    </message>
-    <message>
-        <source>to
-</source>
-        <translation type="obsolete">至</translation>
-    </message>
-    <message>
-        <source>Could not move
-</source>
-        <translation type="obsolete">無法移動</translation>
-    </message>
-    <message>
         <source>Add To Documents</source>
         <translation>新增至文件</translation>
     </message>
     <message>
         <source>Actions</source>
         <translation>動作</translation>
     </message>
     <message>
         <source>Select All</source>
         <translation>選擇全部</translation>
     </message>
     <message>
-        <source>Really delete
-%1 files?</source>
-        <translation type="obsolete">確定要刪除
-%1 個檔案?</translation>
-    </message>
-    <message>
         <source>Delete Directory?</source>
         <translation>刪除目錄?</translation>
     </message>
     <message>
-        <source>Really copy
-%1 files?</source>
-        <translation type="obsolete">確定要複製
-%1 個檔案?</translation>
-    </message>
-    <message>
         <source>File Exists!</source>
         <translation>檔案已存在!</translation>
     </message>
     <message>
-        <source>
-exists. Ok to overwrite?</source>
-        <translation type="obsolete"> 已存在. 要覆蓋嗎?</translation>
-    </message>
-    <message>
-        <source> already exists.
-Do you really want to delete it?</source>
-        <translation type="obsolete"> 已經存在.
-您確定要刪除它?</translation>
-    </message>
-    <message>
-        <source>Advanced FileManager
-is copyright 2002-2003 by
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-and is licensed by the GPL</source>
-        <translation type="obsolete">進階型檔案管理程式
- 版權 2002-2003 
-L.J.Potter&lt;llornkcor@handhelds.org&gt;
-,授權為 GPL</translation>
-    </message>
-    <message>
         <source>File Search</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bookmark Directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove Current Directory from Bookmarks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/appearance.ts b/i18n/zh_TW/appearance.ts
index a5ce303..df8b208 100644
--- a/i18n/zh_TW/appearance.ts
+++ b/i18n/zh_TW/appearance.ts
@@ -13,36 +13,24 @@
         <source>Edit...</source>
         <translation>編輯...</translation>
     </message>
     <message>
         <source>Delete</source>
         <translation>刪除</translation>
     </message>
     <message>
         <source>Save</source>
         <translation>儲存</translation>
     </message>
     <message>
-        <source>Force styling for all applications.</source>
-        <translation type="obsolete">強制將樣式套用到所有的應用程式.</translation>
-    </message>
-    <message>
-        <source>Disable styling for these applications ( &lt;b&gt;*&lt;/b&gt; can be used as a wildcard):</source>
-        <translation type="obsolete">停用這些應用程式的樣式(可以用 &lt;b&gt;*&lt;/b&gt; 當作萬用字元):</translation>
-    </message>
-    <message>
-        <source>Binary file(s)</source>
-        <translation type="obsolete">二元檔</translation>
-    </message>
-    <message>
         <source>Tab style:</source>
         <translation>標籤頁樣式:</translation>
     </message>
     <message>
         <source>Tabs</source>
         <translation>索引標籤</translation>
     </message>
     <message>
         <source>Tabs w/icons</source>
         <translation>有圖示的索引標籤</translation>
     </message>
     <message>
@@ -73,64 +61,44 @@
         <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 type="obsolete">重新啟動</translation>
-    </message>
-    <message>
-        <source>Do you want to restart %1 now?</source>
-        <translation type="obsolete">您現在想要重新啟動 %1 ?</translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="obsolete">是</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <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 type="obsolete">&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>請按這裡以設定目前選擇的樣式.
@@ -161,52 +129,24 @@ Click here to select an available scheme.</source>
         <source>Click here to change the colors in the current color scheme.</source>
         <translation>按這裡以改變目前的色彩主題中的顏色.</translation>
     </message>
     <message>
         <source>Click here to delete the color scheme selected in the list to the left.</source>
         <translation>按這裡以刪除在左方清單中所選擇的色彩主題.</translation>
     </message>
     <message>
         <source>Click here to name and save the current color scheme.</source>
         <translation>按這裡以命名並儲存目前的色彩主題.</translation>
     </message>
     <message>
-        <source>Click here to allow all applications to use global appearance settings.</source>
-        <translation type="obsolete">按這裡讓所有的應用程式使用全域外觀設定值.</translation>
-    </message>
-    <message>
-        <source>If some applications do not display correctly with the global appearance settings, certain features can be turned off for that application.
-
-This area allows you to select an application and which settings you wish to disable.</source>
-        <translation type="obsolete">如果某些應用程式無法正確地以全域外觀設定值顯示, 您可以關閉用於該應用程式的某些功能.
-
-這個區域允許您選擇要那些程式停用設定值.</translation>
-    </message>
-    <message>
-        <source>Click here to add an application to the list above.</source>
-        <translation type="obsolete">按這裡來將應用程式加入上面的清單.</translation>
-    </message>
-    <message>
-        <source>Click here to delete the currently selected application.</source>
-        <translation type="obsolete">按這裡以刪除目前選擇的應用程式.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application up in the list.</source>
-        <translation type="obsolete">按這裡讓目前選擇的應用程式在清單中向上移動.</translation>
-    </message>
-    <message>
-        <source>Click here to move the currently selected application down in the list.</source>
-        <translation type="obsolete">按這裡讓目前選擇的應用程式在清單中向下移動.</translation>
-    </message>
-    <message>
         <source>Click here to select a desired style for tabbed dialogs (such as this application). The styles available are:
 
 1. Tabs - normal tabs with text labels only
 2. Tabs w/icons - tabs with icons for each tab, text label only appears on current tab
 3. Drop down list - a vertical listing of tabs
 4. Drop down list w/icons - a vertical listing of tabs with icons</source>
         <translation>按這裡以選擇想要的索引標籤對話盒(本應用程式屬之)樣式. 可用的樣式有:
 
 1. 索引標籤 - 普通, 只有文字標籤的索引標籤
 2. 有圖示的索引標籤 - 每個索引標籤都有圖示, 文字標籤只出現在目前的索引標籤
 3. 直式索引標籤 - 垂直排列的索引標籤
 4. 有圖示的直式索引標籤 - 垂直排列且有圖示的索引標籤</translation>
diff --git a/i18n/zh_TW/backup.ts b/i18n/zh_TW/backup.ts
index f61c78a..5c25a57 100644
--- a/i18n/zh_TW/backup.ts
+++ b/i18n/zh_TW/backup.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BackupAndRestore</name>
     <message>
-        <source>Backup and Restore... working...</source>
-        <translation type="obsolete">備份與還原...執行中...</translation>
-    </message>
-    <message>
         <source>Backup and Restore</source>
         <translation>備份與還原</translation>
     </message>
     <message>
         <source>Error from System:
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,28 +85,24 @@
         <source>Backup And Restore</source>
         <translation>備份與還原</translation>
     </message>
     <message>
         <source>Backup</source>
         <translation>備份</translation>
     </message>
     <message>
         <source>Applications</source>
         <translation>應用程式</translation>
     </message>
     <message>
-        <source>Save To</source>
-        <translation type="obsolete">儲存至</translation>
-    </message>
-    <message>
         <source>&amp;Backup</source>
         <translation>&amp; 備份</translation>
     </message>
     <message>
         <source>Restore</source>
         <translation>還原</translation>
     </message>
     <message>
         <source>Select Source</source>
         <translation>選擇來源</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/calculator.ts b/i18n/zh_TW/calculator.ts
index 01e8088..30c2559 100644
--- a/i18n/zh_TW/calculator.ts
+++ b/i18n/zh_TW/calculator.ts
@@ -1,20 +1,16 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calculator</name>
     <message>
-        <source>Experimental Calculator</source>
-        <translation type="obsolete">實驗用計算機</translation>
-    </message>
-    <message>
         <source>M+</source>
         <translation>M+</translation>
     </message>
     <message>
         <source>MR</source>
         <translation>MR</translation>
     </message>
     <message>
         <source>MC</source>
         <translation>MC</translation>
     </message>
     <message>
@@ -120,28 +116,24 @@
     <message>
         <source>2</source>
         <translation>2</translation>
     </message>
     <message>
         <source>Calculator</source>
         <translation type="unfinished">計算機</translation>
     </message>
 </context>
 <context>
     <name>CalculatorImpl</name>
     <message>
-        <source>Calculator</source>
-        <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>
diff --git a/i18n/zh_TW/clock.ts b/i18n/zh_TW/clock.ts
index 7bf6850..33999dc 100644
--- a/i18n/zh_TW/clock.ts
+++ b/i18n/zh_TW/clock.ts
@@ -31,72 +31,36 @@
     <message>
         <source> mins</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Clock</name>
     <message>
-        <source>Snooze</source>
-        <translation type="obsolete">打盹</translation>
-    </message>
-    <message>
-        <source>Clock</source>
-        <translation type="obsolete">時鐘</translation>
-    </message>
-    <message>
-        <source>Stopwatch</source>
-        <translation type="obsolete">碼表</translation>
-    </message>
-    <message>
         <source>Start</source>
         <translation>開始</translation>
     </message>
     <message>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">設定鬧鐘</translation>
-    </message>
-    <message>
         <source>Stop</source>
         <translation>停止</translation>
     </message>
     <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Alarm Is On</source>
-        <translation type="obsolete">鬧鐘已開啟</translation>
-    </message>
-    <message>
-        <source>Alarm Is Off</source>
-        <translation type="obsolete">鬧鐘已關閉</translation>
-    </message>
-    <message>
-        <source>Set date and time.</source>
-        <translation type="obsolete">設定時間與日期</translation>
-    </message>
-    <message>
-        <source>Clock: Alarm was missed.</source>
-        <translation type="obsolete">Clock: Alarm was missed.</translation>
-    </message>
-    <message>
         <source>Mon</source>
         <comment>Monday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tue</source>
         <comment>Tuesday</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Wed</source>
         <comment>Wednesday</comment>
@@ -230,54 +194,13 @@ one day to be selected.</source>
         <source>Countdown Alarm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Set_Alarm</name>
-    <message>
-        <source>Set Alarm</source>
-        <translation type="obsolete">設定鬧鐘</translation>
-    </message>
-    <message>
-        <source>Hour</source>
-        <translation type="obsolete">小時</translation>
-    </message>
-    <message>
-        <source>Minute</source>
-        <translation type="obsolete">分鐘</translation>
-    </message>
-    <message>
-        <source>AM</source>
-        <translation type="obsolete">AM</translation>
-    </message>
-    <message>
-        <source>PM</source>
-        <translation type="obsolete">PM</translation>
-    </message>
-    <message>
-        <source>Snooze Delay
-(minutes)</source>
-        <translation type="obsolete">Snooze Delay(new line)
-(minutes)</translation>
-    </message>
-    <message>
-        <source>mp3 alarm</source>
-        <translation type="obsolete">mp3 alarm</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">全部</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">Audio</translation>
-    </message>
-</context>
 </TS>
diff --git a/i18n/zh_TW/datebook.ts b/i18n/zh_TW/datebook.ts
index b566d81..aa3c197 100644
--- a/i18n/zh_TW/datebook.ts
+++ b/i18n/zh_TW/datebook.ts
@@ -331,24 +331,32 @@ Quit anyway?</translation>
     <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>
+    <message>
+        <source>Plugins</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pluginlist</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>
@@ -534,28 +542,24 @@ Quit anyway?</translation>
     <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="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>
diff --git a/i18n/zh_TW/embeddedkonsole.ts b/i18n/zh_TW/embeddedkonsole.ts
index 1b52294..ac499d9 100644
--- a/i18n/zh_TW/embeddedkonsole.ts
+++ b/i18n/zh_TW/embeddedkonsole.ts
@@ -19,44 +19,24 @@
     <message>
         <source>&lt;B&gt;Suggested Commands&lt;/B&gt;:</source>
         <translation>&lt;B&gt;建議的指令&lt;/B&gt;</translation>
     </message>
 </context>
 <context>
     <name>Konsole</name>
     <message>
         <source>Terminal</source>
         <translation>終端機</translation>
     </message>
     <message>
-        <source>Micro</source>
-        <translation type="obsolete">微型</translation>
-    </message>
-    <message>
-        <source>Small Fixed</source>
-        <translation type="obsolete">小型固定式</translation>
-    </message>
-    <message>
-        <source>Medium Fixed</source>
-        <translation type="obsolete">中型固定式</translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="obsolete">字型</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">選項</translation>
-    </message>
-    <message>
         <source>New</source>
         <translation>新增</translation>
     </message>
     <message>
         <source>Enter</source>
         <translation>Enter</translation>
     </message>
     <message>
         <source>Space</source>
         <translation>空白</translation>
     </message>
     <message>
@@ -75,52 +55,36 @@
         <source>Paste</source>
         <translation>貼上</translation>
     </message>
     <message>
         <source>Show command list</source>
         <translation>顯示指令清單</translation>
     </message>
     <message>
         <source>Hide command list</source>
         <translation>隱藏指令清單</translation>
     </message>
     <message>
-        <source>Tabs on Bottom</source>
-        <translation type="obsolete">索引標籤在底部</translation>
-    </message>
-    <message>
         <source>Green on Black</source>
         <translation>黑底綠字</translation>
     </message>
     <message>
         <source>Black on White</source>
         <translation>白底黑字</translation>
     </message>
     <message>
         <source>White on Black</source>
         <translation>黑底白字</translation>
     </message>
     <message>
-        <source>Black on Transparent</source>
-        <translation type="obsolete">黑字, 透明背景</translation>
-    </message>
-    <message>
-        <source>Black on Red</source>
-        <translation type="obsolete">紅底黑字</translation>
-    </message>
-    <message>
-        <source>Red on Black</source>
-        <translation type="obsolete">黑底紅字</translation>
-    </message>
-    <message>
         <source>Green on Yellow</source>
         <translation>黃底綠字</translation>
     </message>
     <message>
         <source>Blue on Magenta</source>
         <translation>洋紅底藍字</translation>
     </message>
     <message>
         <source>Magenta on Blue</source>
         <translation>藍底洋紅字</translation>
     </message>
     <message>
@@ -139,28 +103,24 @@
         <source>Amber on Black</source>
         <translation>黑底琥珀字</translation>
     </message>
     <message>
         <source>Colors</source>
         <translation>顏色</translation>
     </message>
     <message>
         <source>Quick Edit</source>
         <translation>快速編輯</translation>
     </message>
     <message>
-        <source>Edit</source>
-        <translation type="obsolete">編輯</translation>
-    </message>
-    <message>
         <source>None</source>
         <translation>無</translation>
     </message>
     <message>
         <source>Left</source>
         <translation>左</translation>
     </message>
     <message>
         <source>Right</source>
         <translation>右</translation>
     </message>
     <message>
@@ -183,28 +143,24 @@
         <source>Command List</source>
         <translation>指令清單</translation>
     </message>
     <message>
         <source>Wrap</source>
         <translation>換行</translation>
     </message>
     <message>
         <source>Use Beep</source>
         <translation>使用嗶聲</translation>
     </message>
     <message>
-        <source>Tabs on Top</source>
-        <translation type="obsolete">索引標籤在頂端</translation>
-    </message>
-    <message>
         <source>Konsole</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bottom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/fifteen.ts b/i18n/zh_TW/fifteen.ts
index d8e5cac..240b012 100644
--- a/i18n/zh_TW/fifteen.ts
+++ b/i18n/zh_TW/fifteen.ts
@@ -51,28 +51,24 @@
     <message>
         <source>&lt;b&gt;Columns:&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FifteenMainWindow</name>
     <message>
         <source>Randomize</source>
         <translation>隨機</translation>
     </message>
     <message>
-        <source>Solve</source>
-        <translation type="obsolete">解決</translation>
-    </message>
-    <message>
         <source>Game</source>
         <translation>遊戲</translation>
     </message>
     <message>
         <source>Fifteen Pieces</source>
         <translation>十五片</translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/i18n/zh_TW/formatter.ts b/i18n/zh_TW/formatter.ts
index a5ae168..512e7ee 100644
--- a/i18n/zh_TW/formatter.ts
+++ b/i18n/zh_TW/formatter.ts
@@ -13,75 +13,49 @@
         <source>File Systems</source>
         <translation>檔案系統</translation>
     </message>
     <message>
         <source>Format</source>
         <translation>格式</translation>
     </message>
     <message>
         <source>Main</source>
         <translation>主要</translation>
     </message>
     <message>
-        <source>CAUTION:
-Changing parameters on this 
-page may cause your system 
-to stop functioning properly!!</source>
-        <translation type="obsolete">警告:
-改變這一頁的參數
-可能造成您的系統
-停止正常功能!!</translation>
-    </message>
-    <message>
         <source>Edit fstab</source>
         <translation>編輯 fstab</translation>
     </message>
     <message>
         <source>Check Disk</source>
         <translation>檢查磁碟</translation>
     </message>
     <message>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
         <source>Mount Point</source>
         <translation>掛載點</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <source>Format?!?</source>
-        <translation type="obsolete">格式化?!?</translation>
-    </message>
-    <message>
         <source>Really format
 </source>
         <translation>確定要格式化</translation>
     </message>
     <message>
-        <source>
-with </source>
-        <translation type="obsolete">
-為 </translation>
-    </message>
-    <message>
-        <source> filesystem?!?
-You will loose all data!!</source>
-        <translation type="obsolete"> 檔案系統?!?
-您將會失去所有的資料!!</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation>是</translation>
     </message>
     <message>
         <source>No</source>
         <translation>否</translation>
     </message>
     <message>
         <source>Could not format.
 Unknown type</source>
         <translation>無法格式化.
 未知的類型</translation>
@@ -118,50 +92,36 @@ Device is busy!</source>
     </message>
     <message>
         <source>No such device!</source>
         <translation>沒有這個裝置!</translation>
     </message>
     <message>
         <source>
 has been successfully formatted.</source>
         <translation>
 已經成功地格式化.</translation>
     </message>
     <message>
-        <source>Trying to mount.</source>
-        <translation type="obsolete">正在嘗試掛載.</translation>
-    </message>
-    <message>
         <source>Card mount failed!</source>
         <translation>掛載記憶卡失敗!</translation>
     </message>
     <message>
-        <source>
-has been successfully mounted.</source>
-        <translation type="obsolete">
-已經成功地掛載.</translation>
-    </message>
-    <message>
         <source>You can now close the output window.</source>
         <translation>您現在可以關閉輸出視窗.</translation>
     </message>
     <message>
         <source>Internal</source>
         <translation>內部的</translation>
     </message>
     <message>
-        <source>Storage Type : </source>
-        <translation type="obsolete">儲存類型 : </translation>
-    </message>
-    <message>
         <source>Total: %1 kB ( %d mB)
 </source>
         <translation>總計: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
         <source>Used: %1 kB ( %d mB)
 </source>
         <translation>已使用: %1 kB ( %d mB)
 </translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/go.ts b/i18n/zh_TW/go.ts
index 74dc89e..48487d9 100644
--- a/i18n/zh_TW/go.ts
+++ b/i18n/zh_TW/go.ts
@@ -39,18 +39,14 @@
     <message>
         <source>A draw.</source>
         <translation>A draw.</translation>
     </message>
     <message>
         <source>I pass</source>
         <translation>I pass</translation>
     </message>
     <message>
         <source>Prisoners: black %1, white %2</source>
         <translation>Prisoner: 黑 %1, 白 %2</translation>
     </message>
-    <message>
-        <source>Go</source>
-        <translation type="obsolete">圍棋</translation>
-    </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/kbill.ts b/i18n/zh_TW/kbill.ts
index 817fff1..8efdba1 100644
--- a/i18n/zh_TW/kbill.ts
+++ b/i18n/zh_TW/kbill.ts
@@ -25,28 +25,24 @@
         <source>&amp;File</source>
         <translation>檔案(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
     </message>
     <message>
         <source>Pause Game</source>
         <translation>暫停遊戲</translation>
     </message>
     <message>
-        <source>&lt;b&gt;The Story&lt;/b&gt;&lt;p&gt;Yet again, the fate of the world rests in your hands!  An evil computer hacker, known only by his handle &apos;Bill&apos;, has created the ultimate computer virus.  A virus so powerful that it has the power to transmute an ordinary computer into a toaster oven.  (oooh!) &apos;Bill&apos; has cloned himself into a billion-jillion micro-Bills.  Their sole purpose is to deliver the nefarious virus, which has been cleverly diguised as a popular operating system. As System Administrator and Exterminator, your job is to keep Bill from succeeding at his task.</source>
-        <translation type="obsolete">&lt;b&gt;故事&lt;/b&gt;這個世界的命運又再度掌握在你的手裡! 有一個邪惡的電腦駭客, 只知道他的代號是 &apos;Bill&apos;, 已經製造了一種終極的電腦病毒. 這個病毒的威力十分強大, 甚至可以把一般的電腦變成一臺烤麵包機. (噢!) &apos;Bill&apos; 已經把自己複製成多得數不清的微型比爾. 他們唯一的目的就是要散佈這個凶惡的病毒, 而它已經被巧妙地偽裝成一個非常熱門的作業系統. 身為系統管理者與病毒剋星, 你的工作是阻止比爾完成他的野心.</translation>
-    </message>
-    <message>
         <source>The story of KBill</source>
         <translation>K比爾的故事</translation>
     </message>
     <message>
         <source>The rules of KBill</source>
         <translation>K比爾的規則</translation>
     </message>
     <message>
         <source>&lt;b&gt;The Rules&lt;/b&gt;&lt;p&gt;kBill has been painstakingly designed and researched in order to make it as easy to use for the whole family as it is for little Sally. Years - nay - days of beta testing and consulting with the cheapest of human interface designers have resulted in a game that is easy to use, yet nothing at all like a Macintosh.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;Whack the Bills (click)&lt;/LI&gt;&lt;LI&gt;Restart the computer (click)&lt;/LI&gt;&lt;LI&gt;Pick up stolen OSes &amp; return (drag) them to their respective computers&lt;/LI&gt;&lt;LI&gt;Drag the bucket to extinguish sparks&lt;/LI&gt;&lt;LI&gt;Scoring is based on total uptime, with bonuses for killing Bills.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;As for the rest, you can probably work it out for yourself.  We did, so it can&apos;t be too hard</source>
         <translation>&lt;b&gt;規則&lt;/bK比爾經過辛勤的設計與研究使它變得很容易而適合全家人, 正如適合小 Sally 一樣. 日復一日的 beta 測試加上向廉價人工智慧設計師諮詢終於產生容易使用的遊戲, 不過一點也不像麥金塔.&lt;p&gt;&lt;UL&gt;&lt;LI&gt;敲打比爾(點一下)&lt;/LI&gt;&lt;LI&gt;重新啟動電腦(點一下)&lt;/LI&gt;&lt;LI&gt;撿起被偷的作業系統 &amp; 把它們交還(拖放)給各自的電腦&lt;/LI&gt;&lt;LI&gt;拖拉水桶去澆熄火花&lt;/LI&gt;&lt;LI&gt;分數是以花費的時間計算, 殺掉比爾還有紅利.&lt;/LI&gt;&lt;/UL&gt;&lt;P&gt;至於剩下的部份, 您應該可以靠自己解決. 我們做到了, 所以它應該不會太難.</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/keypebble.ts b/i18n/zh_TW/keypebble.ts
index e438475..282e79a 100644
--- a/i18n/zh_TW/keypebble.ts
+++ b/i18n/zh_TW/keypebble.ts
@@ -20,28 +20,24 @@ connection.</source>
         <translation>讀取錯誤: QSocket 回報資料讀取錯誤, 
 遠端主機可能已經忽略這個
 連線.</translation>
     </message>
     <message>
         <source>QSocket reported an invalid error code</source>
         <translation>QSocket 回報了無效的錯誤代碼</translation>
     </message>
 </context>
 <context>
     <name>KRFBDecoder</name>
     <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="obsolete">等候伺服器初始化...</translation>
-    </message>
-    <message>
         <source>Waiting for desktop name...</source>
         <translation>等候桌面名稱...</translation>
     </message>
     <message>
         <source>Connected to %1</source>
         <translation>連線到 %1</translation>
     </message>
     <message>
         <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
         <translation>通訊協定錯誤: 在等待更新的訊息時卻發現 訊息 Id %1.</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/libbatteryapplet.ts b/i18n/zh_TW/libbatteryapplet.ts
index 32dbd40..eb39923 100644
--- a/i18n/zh_TW/libbatteryapplet.ts
+++ b/i18n/zh_TW/libbatteryapplet.ts
@@ -1,28 +1,20 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>BatteryStatus</name>
     <message>
-        <source>Close</source>
-        <translation type="obsolete">關閉</translation>
-    </message>
-    <message>
         <source>Charging</source>
         <translation>充電中</translation>
     </message>
     <message>
-        <source>Percentage battery remaining</source>
-        <translation type="obsolete">Percentage battery remaining</translation>
-    </message>
-    <message>
         <source>Battery status: </source>
         <translation>電池狀態:</translation>
     </message>
     <message>
         <source>Good</source>
         <translation>良好</translation>
     </message>
     <message>
         <source>Low</source>
         <translation>低</translation>
     </message>
     <message>
@@ -41,28 +33,24 @@
         <source>On backup power</source>
         <translation>使用備份電源</translation>
     </message>
     <message>
         <source>Power on-line</source>
         <translation>使用電源線</translation>
     </message>
     <message>
         <source>External power disconnected</source>
         <translation>外部電源切斷</translation>
     </message>
     <message>
-        <source>Battery time remaining</source>
-        <translation type="obsolete">Battery time remaining</translation>
-    </message>
-    <message>
         <source>Failure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>could not open file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charging both devices</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/libliquid.ts b/i18n/zh_TW/libliquid.ts
index 9b4dece..2335328 100644
--- a/i18n/zh_TW/libliquid.ts
+++ b/i18n/zh_TW/libliquid.ts
@@ -1,21 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>Decoration</name>
-    <message>
-        <source>Liquid</source>
-        <translation type="obsolete">透明</translation>
-    </message>
-</context>
-<context>
     <name>LiquidSettings</name>
     <message>
         <source>Liquid Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No translucency</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stippled, background color</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libopiepim2.ts b/i18n/zh_TW/libopiepim2.ts
index ce08ef9..2614191 100644
--- a/i18n/zh_TW/libopiepim2.ts
+++ b/i18n/zh_TW/libopiepim2.ts
@@ -206,173 +206,24 @@ and </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>
 </context>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Repeating Event</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">日</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">星期</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">月份</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">年份</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">每:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">重復的</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">End On:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">星期一</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">星期二</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">星期三</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">星期四</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">星期五</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">星期六</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">星期日</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">每</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">星期一</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">星期二</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">星期三</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">星期四</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">星期五</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">星期六</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">星期日</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">日</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">每</translation>
-    </message>
-</context>
-<context>
-    <name>OTimePickerDialogBase</name>
-    <message>
-        <source>Time:</source>
-        <translation type="obsolete">Time:</translation>
-    </message>
-    <message>
-        <source>:</source>
-        <translation type="obsolete">:</translation>
-    </message>
-    <message>
-        <source>Pick Time:</source>
-        <translation type="obsolete">Pick Time:</translation>
-    </message>
-</context>
-<context>
     <name>Opie::OPimMainWindow</name>
     <message>
         <source>Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation type="unfinished"></translation>
diff --git a/i18n/zh_TW/libopieui2.ts b/i18n/zh_TW/libopieui2.ts
index e39ee18..a07dfeb 100644
--- a/i18n/zh_TW/libopieui2.ts
+++ b/i18n/zh_TW/libopieui2.ts
@@ -1,148 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>ORecurranceBase</name>
-    <message>
-        <source>Repeating Event </source>
-        <translation type="obsolete">Repeating Event</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">日</translation>
-    </message>
-    <message>
-        <source>Week</source>
-        <translation type="obsolete">星期</translation>
-    </message>
-    <message>
-        <source>Month</source>
-        <translation type="obsolete">月份</translation>
-    </message>
-    <message>
-        <source>Year</source>
-        <translation type="obsolete">年份</translation>
-    </message>
-    <message>
-        <source>Every:</source>
-        <translation type="obsolete">每:</translation>
-    </message>
-    <message>
-        <source>Frequency</source>
-        <translation type="obsolete">重復的</translation>
-    </message>
-    <message>
-        <source>End On:</source>
-        <translation type="obsolete">End On:</translation>
-    </message>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">星期一</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">星期二</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">星期三</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">星期四</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">星期五</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">星期六</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">星期日</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">每</translation>
-    </message>
-    <message>
-        <source>Var 2</source>
-        <translation type="obsolete">Var 2</translation>
-    </message>
-    <message>
-        <source>WeekVar</source>
-        <translation type="obsolete">WeekVar</translation>
-    </message>
-</context>
-<context>
-    <name>ORecurranceWidget</name>
-    <message>
-        <source>No End Date</source>
-        <translation type="obsolete">No End Date</translation>
-    </message>
-    <message>
-        <source>Repeat On</source>
-        <translation type="obsolete">在某天重復</translation>
-    </message>
-    <message>
-        <source>Mon</source>
-        <translation type="obsolete">星期一</translation>
-    </message>
-    <message>
-        <source>Tue</source>
-        <translation type="obsolete">星期二</translation>
-    </message>
-    <message>
-        <source>Wed</source>
-        <translation type="obsolete">星期三</translation>
-    </message>
-    <message>
-        <source>Thu</source>
-        <translation type="obsolete">星期四</translation>
-    </message>
-    <message>
-        <source>Fri</source>
-        <translation type="obsolete">星期五</translation>
-    </message>
-    <message>
-        <source>Sat</source>
-        <translation type="obsolete">星期六</translation>
-    </message>
-    <message>
-        <source>Sun</source>
-        <translation type="obsolete">星期日</translation>
-    </message>
-    <message>
-        <source>Day</source>
-        <translation type="obsolete">日</translation>
-    </message>
-    <message>
-        <source>Every</source>
-        <translation type="obsolete">每</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>
@@ -273,28 +139,24 @@
     <message>
         <source>Key is already assigned</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;The Key you choose is already taken by a different Item of your config. Please tryusing a different key.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Every</source>
-        <translation type="obsolete">每</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>
diff --git a/i18n/zh_TW/libqpe.ts b/i18n/zh_TW/libqpe.ts
index dbf0748..17c66bf 100644
--- a/i18n/zh_TW/libqpe.ts
+++ b/i18n/zh_TW/libqpe.ts
@@ -185,28 +185,24 @@ editing categories.</source>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
 </context>
 <context>
     <name>FindWidget</name>
     <message>
         <source>String Not Found.</source>
         <translation>找不到字串.</translation>
     </message>
     <message>
-        <source>End reached, starting at beginning</source>
-        <translation type="obsolete">到達結尾, 從開頭處找起</translation>
-    </message>
-    <message>
         <source>End reached, starting at %1</source>
         <comment>Date using TimeString::shortDate</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FindWidgetBase</name>
     <message>
         <source>Find</source>
         <translation>尋找</translation>
     </message>
     <message>
@@ -443,32 +439,24 @@ Please free up some space
 before entering data</source>
         <translation>無法建立啟動檔案
 在開始輸入資料之前
 請先釋放一些空間</translation>
     </message>
     <message>
         <source>Unable to schedule alarm.
 Free some memory and try again.</source>
         <translation>無法排程警示.
 請釋放一些記憶體並再試一次.</translation>
     </message>
     <message>
-        <source>D</source>
-        <translation type="obsolete">D</translation>
-    </message>
-    <message>
-        <source>M</source>
-        <translation type="obsolete">M</translation>
-    </message>
-    <message>
         <source>Y</source>
         <translation>Y</translation>
     </message>
     <message>
         <source>day</source>
         <translation>日</translation>
     </message>
     <message>
         <source>month</source>
         <translation>月</translation>
     </message>
     <message>
@@ -503,30 +491,24 @@ Free some memory and try again.</source>
         <source>Fri</source>
         <translation>五</translation>
     </message>
     <message>
         <source>Sat</source>
         <translation>六</translation>
     </message>
     <message>
         <source>Sun</source>
         <translation>日</translation>
     </message>
     <message>
-        <source>Are you sure you want to delete
- %1?</source>
-        <translation type="obsolete">您確定要刪除
- %1?</translation>
-    </message>
-    <message>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
         <source>Unfiled</source>
         <translation>未歸檔</translation>
     </message>
     <message>
         <source>&lt;b&gt;Work Address:&lt;/b&gt;</source>
         <translation>&lt;b&gt;工作地址:&lt;/b&gt;</translation>
     </message>
     <message>
@@ -781,44 +763,24 @@ Free some memory and try again.</source>
         <source>Notes</source>
         <translation>備註</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>群組</translation>
     </message>
     <message>
         <source>New Document</source>
         <translation>新增文件</translation>
     </message>
     <message>
-        <source>Click to close this window, discarding changes.</source>
-        <translation type="obsolete">按這裡關閉這個視窗, 放棄所做的變更.</translation>
-    </message>
-    <message>
-        <source>Click to close this window.</source>
-        <translation type="obsolete">按這裡關閉視窗.</translation>
-    </message>
-    <message>
-        <source>Click to close this window and apply changes.</source>
-        <translation type="obsolete">按這裡關閉視窗並接受所有的變更.</translation>
-    </message>
-    <message>
-        <source>Click to make this window moveable.</source>
-        <translation type="obsolete">按這裡讓這個視窗可以移動.</translation>
-    </message>
-    <message>
-        <source>Click to make this window use all available screen area.</source>
-        <translation type="obsolete">按這裡讓這個視窗使用所有可用的螢幕區域.</translation>
-    </message>
-    <message>
         <source>&lt;Qt&gt;Comprehensive help is not available for this application, however there is context-sensitive help.&lt;p&gt;To use context-sensitive help:&lt;p&gt;&lt;ol&gt;&lt;li&gt;click and hold the help button.&lt;li&gt;when the title bar shows &lt;b&gt;What&apos;s this...&lt;/b&gt;, click on any control.&lt;/ol&gt;&lt;/Qt&gt;</source>
         <translation type="unfinished">&lt;QT&gt;泛用說明無法用於這個應用程式, 不過還有內容感應式說明.&lt;p&gt;要使用內容感應式說明:&lt;p&gt;&lt;ol&gt;&lt;li&gt;按住並停留在說明按鈕上.&lt;li&gt;當標題列顯示 &lt;b&gt;這是什麼...&lt;/b&gt; 時, 按一下任何控制元.&lt;/ol&gt;&lt;/Qt&gt;</translation>
     </message>
     <message>
         <source>What&apos;s this...</source>
         <translation type="unfinished">這是什麼...</translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete
  %1?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
@@ -862,28 +824,24 @@ Free some memory and try again.</source>
         <source>Oct</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nov</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Error</source>
-        <translation type="obsolete">錯誤</translation>
-    </message>
-    <message>
         <source>D</source>
         <comment>Shortcut for Day</comment>
         <translation type="unfinished">D</translation>
     </message>
     <message>
         <source>M</source>
         <comment>Shortcur for Month</comment>
         <translation type="unfinished">M</translation>
     </message>
 </context>
 <context>
     <name>QPEApplication</name>
diff --git a/i18n/zh_TW/libwlan.ts b/i18n/zh_TW/libwlan.ts
index da97782..d7985ab 100644
--- a/i18n/zh_TW/libwlan.ts
+++ b/i18n/zh_TW/libwlan.ts
@@ -1,165 +1,148 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>AWLan</name>
-    <message>
-        <source>&lt;UseHostName&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>WLAN</name>
-</context>
-<context>
-    <name>WLanGUI</name>
     <message>
-        <source>Form1</source>
+        <source>Wireless Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>any</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Managed</source>
+        <source>SSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ad-Hoc</source>
+        <source>Infrastructure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
+        <source>Auto</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Mode</source>
+        <source>Managed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESS-ID</source>
+        <source>Ad-Hoc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;UseHostName&gt;</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Specify Access Point</source>
+        <source>Specify &amp;Access Point</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MAC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>SSID</source>
+        <source>Specify &amp;Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Chn</source>
+        <source>Rescan Neighbourhood</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Scan</source>
+        <source>Chn</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Enable Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Key Setting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key &amp;4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Key &amp;2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Key &amp;3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept Non-Encrypted packets</source>
+        <source>Key &amp;4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>State</source>
+        <source>Non-encrypted Packets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Station</source>
+        <source>&amp;Accept</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>ESSID</source>
+        <source>&amp;Reject</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>WlanInfo</name>
     <message>
-        <source>AP</source>
+        <source>Interface Information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel</source>
+        <source>802.11b</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rate</source>
+        <source>Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Freq</source>
+        <source>Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Link Quality</source>
+        <source>ESSID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Noise</source>
+        <source>Station</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality</source>
+        <source>AP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Signal</source>
+        <source>Rate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Live feed </source>
+        <source>Quality</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>WLanNetNode</name>
     <message>
-        <source>WLan Device</source>
+        <source>Noise</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;p&gt;Configure Wi/Fi or WLan network cards.&lt;/p&gt;&lt;p&gt;Defines Wireless options for those cards&lt;/p&gt;</source>
+        <source>Signal</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WlanInfo</name>
-</context>
 </TS>
diff --git a/i18n/zh_TW/mindbreaker.ts b/i18n/zh_TW/mindbreaker.ts
index f854a91..f6e9662 100644
--- a/i18n/zh_TW/mindbreaker.ts
+++ b/i18n/zh_TW/mindbreaker.ts
@@ -8,36 +8,24 @@
     <message>
         <source>win avg: %1 turns (%2 games)</source>
         <translation>勝利平均: %1 輪 (%2 場遊戲)</translation>
     </message>
     <message>
         <source>Mind Breaker</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MindBreakerBoard</name>
     <message>
-        <source>Go%1p%2</source>
-        <translation type="obsolete">到%1p%2</translation>
-    </message>
-    <message>
-        <source>CurrentGo%1</source>
-        <translation type="obsolete">目前到%1</translation>
-    </message>
-    <message>
-        <source>Answer%1</source>
-        <translation type="obsolete">答案%1</translation>
-    </message>
-    <message>
         <source>Reset Statistics</source>
         <translation>重設統計資料</translation>
     </message>
     <message>
         <source>Reset the win ratio?</source>
         <translation>要重設勝率?</translation>
     </message>
     <message>
         <source>OK</source>
         <translation>確定</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/minesweep.ts b/i18n/zh_TW/minesweep.ts
index d8ed5ac..8b5805d 100644
--- a/i18n/zh_TW/minesweep.ts
+++ b/i18n/zh_TW/minesweep.ts
@@ -1,28 +1,24 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>MineSweep</name>
     <message>
         <source>You won!</source>
         <translation>你贏了!</translation>
     </message>
     <message>
         <source>You exploded!</source>
         <translation>你爆了!</translation>
     </message>
     <message>
-        <source>Mine Hunt</source>
-        <translation type="obsolete">採地雷</translation>
-    </message>
-    <message>
         <source>Beginner</source>
         <translation>初學</translation>
     </message>
     <message>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
         <source>Expert</source>
         <translation>專家</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/opie-eye.ts b/i18n/zh_TW/opie-eye.ts
index 02da4de..5e243c4 100644
--- a/i18n/zh_TW/opie-eye.ts
+++ b/i18n/zh_TW/opie-eye.ts
@@ -16,24 +16,28 @@
     <message>
         <source>Size of thumbnails:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show toolbar on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save status of fullscreen/autorotate</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Default display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImageView</name>
     <message>
         <source>View Image Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle autorotate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -47,24 +51,32 @@
     <message>
         <source>Switch to previous image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle fullscreen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toggle thumbnail</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Increase brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PIconView</name>
     <message>
         <source>View as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Beam Current Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -197,24 +209,36 @@
     <message>
         <source>Select filesystem</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Listview mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Dont show seperate windows</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Increase brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrease brightness by 5</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>%1 - O View</source>
         <comment>Name of the dir</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show all files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -253,24 +277,28 @@
     <message>
         <source>Error no Camera Dir found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Are you sure you want to delete %1&lt;br&gt; %2?&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm Deletion</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Display brightness:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewModeButton</name>
     <message>
         <source>Thumbnail and Imageinfo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Thumbnail and Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/opie-login.ts b/i18n/zh_TW/opie-login.ts
index de40df3..375c2aa 100644
--- a/i18n/zh_TW/opie-login.ts
+++ b/i18n/zh_TW/opie-login.ts
@@ -1,25 +1,21 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation>確實而精準地點一下十字準線, 
 以便校正您的螢幕.</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">歡迎使用 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>
@@ -41,53 +37,36 @@ accurately to calibrate your screen.</source>
 </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 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>
diff --git a/i18n/zh_TW/opie-sheet.ts b/i18n/zh_TW/opie-sheet.ts
index 3658300..3a3340b 100644
--- a/i18n/zh_TW/opie-sheet.ts
+++ b/i18n/zh_TW/opie-sheet.ts
@@ -195,48 +195,28 @@
         <source>&amp;Save</source>
         <translation>儲存(&amp;S)</translation>
     </message>
     <message>
         <source>Save File As</source>
         <translation>儲存檔案為</translation>
     </message>
     <message>
         <source>Save &amp;As</source>
         <translation>另存新檔(&amp;A)</translation>
     </message>
     <message>
-        <source>Quit</source>
-        <translation type="obsolete">離開</translation>
-    </message>
-    <message>
-        <source>&amp;Quit</source>
-        <translation type="obsolete">離開(&amp;Q)</translation>
-    </message>
-    <message>
-        <source>General Help</source>
-        <translation type="obsolete">一般說明</translation>
-    </message>
-    <message>
-        <source>&amp;General</source>
-        <translation type="obsolete">一般(&amp;G)</translation>
-    </message>
-    <message>
         <source>About Opie Sheet</source>
         <translation>關於 Opie 試算表</translation>
     </message>
     <message>
-        <source>&amp;About</source>
-        <translation type="obsolete">關於(&amp;A)</translation>
-    </message>
-    <message>
         <source>Accept</source>
         <translation>套用</translation>
     </message>
     <message>
         <source>&amp;Accept</source>
         <translation>套用(&amp;A)</translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
@@ -491,216 +471,44 @@
         <source>&amp;Insert</source>
         <translation>插入(&amp;I)</translation>
     </message>
     <message>
         <source>&amp;Format</source>
         <translation>格式(&amp;F)</translation>
     </message>
     <message>
         <source>&amp;Data</source>
         <translation>資料(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation type="obsolete">說明(&amp;H)</translation>
-    </message>
-    <message>
         <source>&amp;Row</source>
         <translation>列(&amp;R)</translation>
     </message>
     <message>
         <source>Colum&amp;n</source>
         <translation>欄(&amp;N)</translation>
     </message>
     <message>
         <source>&amp;Sheet</source>
         <translation>工作表(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Function</source>
         <translation>函數(&amp;F)</translation>
     </message>
     <message>
-        <source>&amp;Standard</source>
-        <translation type="obsolete">標準(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Summation</source>
-        <translation type="obsolete">總和</translation>
-    </message>
-    <message>
-        <source>&amp;Summation</source>
-        <translation type="obsolete">總和(&amp;S)</translation>
-    </message>
-    <message>
-        <source>Absolute Value</source>
-        <translation type="obsolete">絕對值</translation>
-    </message>
-    <message>
-        <source>&amp;Absolute</source>
-        <translation type="obsolete">絕對(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Sine</source>
-        <translation type="obsolete">正弦</translation>
-    </message>
-    <message>
-        <source>Si&amp;ne</source>
-        <translation type="obsolete">正弦(&amp;N)</translation>
-    </message>
-    <message>
-        <source>Arc Sine</source>
-        <translation type="obsolete">反正弦</translation>
-    </message>
-    <message>
-        <source>A&amp;rc Sine</source>
-        <translation type="obsolete">反正弦(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Cosine</source>
-        <translation type="obsolete">餘弦</translation>
-    </message>
-    <message>
-        <source>&amp;Cosine</source>
-        <translation type="obsolete">餘弦(&amp;C)</translation>
-    </message>
-    <message>
-        <source>ArcCosine</source>
-        <translation type="obsolete">反餘弦</translation>
-    </message>
-    <message>
-        <source>Arc Cos&amp;ine</source>
-        <translation type="obsolete">反餘弦(&amp;I)</translation>
-    </message>
-    <message>
-        <source>Tangent</source>
-        <translation type="obsolete">正切</translation>
-    </message>
-    <message>
-        <source>&amp;Tangent</source>
-        <translation type="obsolete">正切(&amp;T)</translation>
-    </message>
-    <message>
-        <source>Arc Tangent</source>
-        <translation type="obsolete">反正切</translation>
-    </message>
-    <message>
-        <source>Arc Tan&amp;gent</source>
-        <translation type="obsolete">反正切(&amp;G)</translation>
-    </message>
-    <message>
-        <source>Arc Tangent of Coordinates</source>
-        <translation type="obsolete">座標的反正切</translation>
-    </message>
-    <message>
-        <source>C&amp;oor. Arc Tangent</source>
-        <translation type="obsolete">座標反正切(&amp;O)</translation>
-    </message>
-    <message>
-        <source>Exponential</source>
-        <translation type="obsolete">指數</translation>
-    </message>
-    <message>
-        <source>&amp;Exponential</source>
-        <translation type="obsolete">指數(&amp;E)</translation>
-    </message>
-    <message>
-        <source>Logarithm</source>
-        <translation type="obsolete">對數</translation>
-    </message>
-    <message>
-        <source>&amp;Logarithm</source>
-        <translation type="obsolete">對數(&amp;L)</translation>
-    </message>
-    <message>
-        <source>Power</source>
-        <translation type="obsolete">乘冪</translation>
-    </message>
-    <message>
-        <source>&amp;Power</source>
-        <translation type="obsolete">乘冪(&amp;P)</translation>
-    </message>
-    <message>
-        <source>&amp;Mathematical</source>
-        <translation type="obsolete">數學的(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Average</source>
-        <translation type="obsolete">平均數</translation>
-    </message>
-    <message>
-        <source>&amp;Average</source>
-        <translation type="obsolete">平均數(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Maximum</source>
-        <translation type="obsolete">最大值</translation>
-    </message>
-    <message>
-        <source>Ma&amp;ximum</source>
-        <translation type="obsolete">最大值(&amp;X)</translation>
-    </message>
-    <message>
-        <source>Minimum</source>
-        <translation type="obsolete">最小值</translation>
-    </message>
-    <message>
-        <source>&amp;Minimum</source>
-        <translation type="obsolete">最小值(&amp;M)</translation>
-    </message>
-    <message>
-        <source>Count</source>
-        <translation type="obsolete">計數</translation>
-    </message>
-    <message>
-        <source>&amp;Count</source>
-        <translation type="obsolete">計數(&amp;C)</translation>
-    </message>
-    <message>
-        <source>&amp;Statistical</source>
-        <translation type="obsolete">統計(&amp;S)</translation>
-    </message>
-    <message>
         <source>Functions</source>
         <translation>函數</translation>
     </message>
     <message>
-        <source>Help file not found!</source>
-        <translation type="obsolete">找不到說明檔!</translation>
-    </message>
-    <message>
-        <source>Opie Sheet
-Spreadsheet Software for Opie
-QWDC Beta Winner (as Sheet/Qt)
-
-Developed by: Serdar Ozler
-Release 1.0.1
-Release Date: July 04, 2002
-
-This product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.
-
-http://qtopia.sitebest.com</source>
-        <translation type="obsolete">Opie 試算表
-Opie 的試算表軟體
-QWDC Beta Winner (以 Sheet/Qt)
-
-開發者: Serdar Ozler
-釋出版本 1.0.1
-釋出日期: 七月 04, 2002
-
-這個產品是依 GPL 授權. 它可以自由地散佈. 如果您想要取得最新的版本和原始碼, 請參觀下列網站.
-
-http://qtopia.sitebest.com</translation>
-    </message>
-    <message>
         <source>&amp;Number of rows:</source>
         <translation>列數(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Number of columns:</source>
         <translation>欄數(&amp;N):</translation>
     </message>
     <message>
         <source>&amp;Number of sheets:</source>
         <translation>工作表數量(&amp;N):</translation>
     </message>
     <message>
@@ -1144,28 +952,24 @@ http://qtopia.sitebest.com</source>
     <message>
         <source>&lt;td&gt;Unable to open or parse file!&lt;/td&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Sheet</name>
     <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
     <message>
-        <source>Syntax error!</source>
-        <translation type="obsolete">語法錯誤!</translation>
-    </message>
-    <message>
         <source>Search key not found!</source>
         <translation>找不到搜尋的目標!</translation>
     </message>
 </context>
 <context>
     <name>SortDialog</name>
     <message>
         <source>&amp;Sort</source>
         <translation>排序(&amp;S)</translation>
     </message>
     <message>
         <source>&amp;Options</source>
diff --git a/i18n/zh_TW/opiemail.ts b/i18n/zh_TW/opiemail.ts
index 92df329..7742719 100644
--- a/i18n/zh_TW/opiemail.ts
+++ b/i18n/zh_TW/opiemail.ts
@@ -1,29 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>Reply</source>
-        <translation type="obsolete">回覆</translation>
-    </message>
-    <message>
-        <source>Reply All</source>
-        <translation type="obsolete">回覆給所有人</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="obsolete">刪除</translation>
-    </message>
-</context>
-<context>
     <name>AccountView</name>
     <message>
         <source>Error creating new Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;center&gt;Error while creating&lt;br&gt;new folder - breaking.&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddressPicker</name>
@@ -173,63 +158,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add File</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Composer</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">表單1</translation>
-    </message>
-    <message>
-        <source>CC</source>
-        <translation type="obsolete">副本</translation>
-    </message>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">主旨</translation>
-    </message>
-    <message>
-        <source>Cancel</source>
-        <translation type="obsolete">取消</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="obsolete">重設</translation>
-    </message>
-    <message>
-        <source>Queue</source>
-        <translation type="obsolete">佇列</translation>
-    </message>
-    <message>
-        <source>Send</source>
-        <translation type="obsolete">傳送</translation>
-    </message>
-    <message>
-        <source>From:</source>
-        <translation type="obsolete">寄件者:</translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="obsolete">收件者:</translation>
-    </message>
-</context>
-<context>
     <name>EditAccounts</name>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Question</source>
         <translation type="unfinished"></translation>
@@ -325,51 +271,24 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>ssh $SERVER exec</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use secure sockets:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MailviewerApp</name>
-    <message>
-        <source>View</source>
-        <translation type="obsolete">檢視</translation>
-    </message>
-    <message>
-        <source>Compose</source>
-        <translation type="obsolete">撰寫</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">設定值</translation>
-    </message>
-    <message>
-        <source>Mail</source>
-        <translation type="obsolete">郵件</translation>
-    </message>
-    <message>
-        <source>Mailboxes</source>
-        <translation type="obsolete">信件匣</translation>
-    </message>
-    <message>
-        <source>Configure OpieMail</source>
-        <translation type="obsolete">設定 Opie郵件</translation>
-    </message>
-</context>
-<context>
     <name>MainWindow</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished">設定值</translation>
     </message>
     <message>
         <source>Compose new mail</source>
         <translation type="unfinished"></translation>
@@ -405,24 +324,76 @@
     <message>
         <source>Sender</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>Server</source>
+        <translation type="unfinished">伺服器</translation>
+    </message>
+    <message>
+        <source>Folder</source>
+        <translation type="unfinished">資料夾</translation>
+    </message>
+    <message>
+        <source>Disconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set on/offline</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh folder list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Create new folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(Un-)Subscribe groups</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh headerlist</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>New subfolder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Delete folder</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Move/Copie all mails</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read current mail</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NNTPGroupsDlg</name>
     <message>
         <source>Subscribed newsgroups</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>NNTPGroupsUI</name>
     <message>
         <source>newsgroupslist</source>
@@ -564,248 +535,24 @@ with that filter will be listed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read this posting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit this mail</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OpieMailConfig</name>
-    <message>
-        <source>OpieMail Config</source>
-        <translation type="obsolete">Opie郵件 組態</translation>
-    </message>
-    <message>
-        <source>Folders</source>
-        <translation type="obsolete">資料夾</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="obsolete">新增(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Modify</source>
-        <translation type="obsolete">修改(&amp;M)</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">刪除(&amp;D)</translation>
-    </message>
-    <message>
-        <source>Folder name</source>
-        <translation type="obsolete">資料夾名稱</translation>
-    </message>
-    <message>
-        <source>Identity</source>
-        <translation type="obsolete">身分識別</translation>
-    </message>
-    <message>
-        <source>Transport</source>
-        <translation type="obsolete">傳輸</translation>
-    </message>
-    <message>
-        <source>Input</source>
-        <translation type="obsolete">輸入</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">名稱</translation>
-    </message>
-    <message>
-        <source>Folder</source>
-        <translation type="obsolete">資料夾</translation>
-    </message>
-    <message>
-        <source>User</source>
-        <translation type="obsolete">使用者</translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="obsolete">伺服器</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">通訊協定</translation>
-    </message>
-    <message>
-        <source>Output</source>
-        <translation type="obsolete">輸出</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailConfigImpl</name>
-    <message>
-        <source>Delete mailbox</source>
-        <translation type="obsolete">刪除信件匣</translation>
-    </message>
-    <message>
-        <source>Delete the mailbox?
-All mails will be deleted.</source>
-        <translation type="obsolete">刪除此信件匣?
-所有的郵件都會被刪除.</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailFolder</name>
-    <message>
-        <source>OpieMail Folder Config</source>
-        <translation type="obsolete">Opie郵件 資料夾組態</translation>
-    </message>
-    <message>
-        <source>Description:</source>
-        <translation type="obsolete">描述:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailIdenty</name>
-    <message>
-        <source>OpieMail Identity - Config</source>
-        <translation type="obsolete">Opie郵件 身分識別 - 組態</translation>
-    </message>
-    <message>
-        <source>Signature:</source>
-        <translation type="obsolete">簽名檔:</translation>
-    </message>
-    <message>
-        <source>Identity:</source>
-        <translation type="obsolete">身分識別:</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-    <message>
-        <source>Organization:</source>
-        <translation type="obsolete">組織:</translation>
-    </message>
-    <message>
-        <source>EMail:</source>
-        <translation type="obsolete">電子郵件:</translation>
-    </message>
-    <message>
-        <source>Reply To</source>
-        <translation type="obsolete">回覆給</translation>
-    </message>
-    <message>
-        <source>Use for sending</source>
-        <translation type="obsolete">用於傳送</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailInputConfig</name>
-    <message>
-        <source>OpieMailInput</source>
-        <translation type="obsolete">Open郵件輸入</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">伺服器:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">通訊協定</translation>
-    </message>
-    <message>
-        <source>Destination Folder</source>
-        <translation type="obsolete">目的資料夾</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">使用者名稱:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">密碼</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">連接埠</translation>
-    </message>
-    <message>
-        <source>110</source>
-        <translation type="obsolete">110</translation>
-    </message>
-    <message>
-        <source>Enable intervall checking.</source>
-        <translation type="obsolete">啟用郵件通知.</translation>
-    </message>
-    <message>
-        <source>Check every:</source>
-        <translation type="obsolete">檢查於每:</translation>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="obsolete"> 分鐘</translation>
-    </message>
-    <message>
-        <source>&amp;Delete mail from server when deleted local.</source>
-        <translation type="obsolete">當刪除本機郵件時也將它從伺服器上刪除(&amp;D).</translation>
-    </message>
-    <message>
-        <source>&amp;Keep Mail on Server</source>
-        <translation type="obsolete">保留伺服器上的郵件(&amp;K)</translation>
-    </message>
-</context>
-<context>
-    <name>OpieMailOutputConfig</name>
-    <message>
-        <source>OpieMailOutPut</source>
-        <translation type="obsolete">Opie郵件輸出</translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="obsolete">名稱:</translation>
-    </message>
-    <message>
-        <source>Protocol</source>
-        <translation type="obsolete">通訊協定</translation>
-    </message>
-    <message>
-        <source>Server:</source>
-        <translation type="obsolete">伺服器:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="obsolete">使用者名稱:</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">密碼</translation>
-    </message>
-    <message>
-        <source>Server requires authentication</source>
-        <translation type="obsolete">伺服器需要驗證</translation>
-    </message>
-    <message>
-        <source>Port</source>
-        <translation type="obsolete">連接埠</translation>
-    </message>
-    <message>
-        <source>25</source>
-        <translation type="obsolete">25</translation>
-    </message>
-</context>
-<context>
     <name>POP3configUI</name>
     <message>
         <source>Configure POP3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name of the Account</source>
         <translation type="unfinished"></translation>
@@ -839,55 +586,24 @@ All mails will be deleted.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Large mail size (kb):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> kB</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QMailView</name>
-    <message>
-        <source>Subject</source>
-        <translation type="obsolete">主旨</translation>
-    </message>
-    <message>
-        <source>To</source>
-        <translation type="obsolete">收件者</translation>
-    </message>
-    <message>
-        <source>Sender</source>
-        <translation type="obsolete">寄件者</translation>
-    </message>
-    <message>
-        <source>Date</source>
-        <translation type="obsolete">日期</translation>
-    </message>
-    <message>
-        <source>(Re)edit</source>
-        <translation type="obsolete">(重新)編輯</translation>
-    </message>
-    <message>
-        <source>Copy To</source>
-        <translation type="obsolete">複製到</translation>
-    </message>
-    <message>
-        <source>Move To</source>
-        <translation type="obsolete">移動到</translation>
-    </message>
-</context>
-<context>
     <name>SMTPconfigUI</name>
     <message>
         <source>Configure SMTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use Login</source>
         <translation type="unfinished"></translation>
@@ -989,40 +705,30 @@ All mails will be deleted.</source>
     <message>
         <source>Check how often</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Blink Led when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Play Sound when new mails arrive</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SplitterWidgetBase</name>
-    <message>
-        <source>Form1</source>
-        <translation type="obsolete">表單1</translation>
-    </message>
-</context>
-<context>
-    <name>StatusWidgetUI</name>
     <message>
-        <source>Form1</source>
-        <translation type="unfinished">表單1</translation>
+        <source>Click opens mail</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>TextLabel1</source>
+        <source>Click activate server/folder</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ViewMail</name>
     <message>
         <source>Show Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save Attachment</source>
         <translation type="unfinished"></translation>
@@ -1066,24 +772,32 @@ All mails will be deleted.</source>
     <message>
         <source>&lt;p&gt;Do you really want to delete this mail? &lt;br&gt;&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display image preview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail by %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Reading attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Could not read content of attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ViewMailBase</name>
     <message>
         <source>Mail</source>
         <translation type="unfinished">郵件</translation>
     </message>
     <message>
         <source>Reply</source>
         <translation type="unfinished">回覆</translation>
     </message>
     <message>
@@ -1109,24 +823,28 @@ All mails will be deleted.</source>
     <message>
         <source>Filename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-Mail view</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Show image preview inline</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>selectsmtp</name>
     <message>
         <source>Select SMTP Account</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>selectstoreui</name>
     <message>
         <source>Select target box</source>
diff --git a/i18n/zh_TW/oxygen.ts b/i18n/zh_TW/oxygen.ts
index f6f659a..b9504e1 100644
--- a/i18n/zh_TW/oxygen.ts
+++ b/i18n/zh_TW/oxygen.ts
@@ -40,40 +40,28 @@
         <source>Group</source>
         <translation>群</translation>
     </message>
     <message>
         <source>Electronegativity</source>
         <translation>電負度</translation>
     </message>
     <message>
         <source>Atomic radius</source>
         <translation>原子半徑</translation>
     </message>
     <message>
-        <source>Ionizationenergie</source>
-        <translation type="obsolete">游離能</translation>
-    </message>
-    <message>
         <source>Density</source>
         <translation>密度</translation>
     </message>
     <message>
-        <source>Boilingpoint</source>
-        <translation type="obsolete">沸點</translation>
-    </message>
-    <message>
-        <source>Meltingpoint</source>
-        <translation type="obsolete">熔點</translation>
-    </message>
-    <message>
         <source>%1 u</source>
         <translation>%1 u</translation>
     </message>
     <message>
         <source>%1 J</source>
         <translation>%1 J</translation>
     </message>
     <message>
         <source>%1 K</source>
         <translation>%1 K</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/patience.ts b/i18n/zh_TW/patience.ts
index 9137dc9..3486b43 100644
--- a/i18n/zh_TW/patience.ts
+++ b/i18n/zh_TW/patience.ts
@@ -5,68 +5,44 @@
         <source>Patience</source>
         <translation>Patience</translation>
     </message>
     <message>
         <source>Freecell</source>
         <translation>Freecell</translation>
     </message>
     <message>
         <source>&amp;Game</source>
         <translation>&amp;遊戲</translation>
     </message>
     <message>
-        <source>&amp;Change Card Backs</source>
-        <translation type="obsolete">&amp;改變花色</translation>
-    </message>
-    <message>
-        <source>&amp;Snap To Position</source>
-        <translation type="obsolete">&amp;自動定位</translation>
-    </message>
-    <message>
         <source>&amp;Settings</source>
         <translation>&amp;設定</translation>
     </message>
     <message>
         <source>&amp;About</source>
         <translation>&amp;關於</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;說明</translation>
     </message>
     <message>
         <source>Play</source>
         <translation>遊戲</translation>
     </message>
     <message>
-        <source>Change Card Backs</source>
-        <translation type="obsolete">改變花色</translation>
-    </message>
-    <message>
-        <source>Snap To Position</source>
-        <translation type="obsolete">自動定位</translation>
-    </message>
-    <message>
-        <source>Turn One Card</source>
-        <translation type="obsolete">翻一張牌</translation>
-    </message>
-    <message>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <source>Turn Three Cards</source>
-        <translation type="obsolete">翻三張牌</translation>
-    </message>
-    <message>
         <source>Chicane</source>
         <translation>Chicane</translation>
     </message>
     <message>
         <source>Harp</source>
         <translation>Harp</translation>
     </message>
     <message>
         <source>Teeclub</source>
         <translation>Teeclub</translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/qpe.ts b/i18n/zh_TW/qpe.ts
index 932ee0c..e298e77 100644
--- a/i18n/zh_TW/qpe.ts
+++ b/i18n/zh_TW/qpe.ts
@@ -57,97 +57,30 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;Could not find the application %1&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>AppMonitor</name>
-    <message>
-        <source>Application Problem</source>
-        <translation type="obsolete">應用程式問題</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;%1 is not responding.&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;%1 is not responding.&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;Would you like to force the application to exit?&lt;/p&gt;</translation>
-    </message>
-</context>
-<context>
     <name>Calibrate</name>
     <message>
         <source>Touch the crosshairs firmly and
 accurately to calibrate your screen.</source>
         <translation type="unfinished">請按下十字架中心以校正觸控筆</translation>
     </message>
-    <message>
-        <source>Welcome to Opie</source>
-        <translation type="obsolete">歡迎進入Opie</translation>
-    </message>
-</context>
-<context>
-    <name>CategoryTabWidget</name>
-    <message>
-        <source>Documents</source>
-        <translation type="obsolete">文件</translation>
-    </message>
-    <message>
-        <source>Icon View</source>
-        <translation type="obsolete">圖示瀏覽</translation>
-    </message>
-    <message>
-        <source>List View</source>
-        <translation type="obsolete">列表瀏覽</translation>
-    </message>
-</context>
-<context>
-    <name>DesktopApplication</name>
-    <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">低電量警告! 
-請把電源關掉直到插上插座</translation>
-    </message>
-    <message>
-        <source>Battery is running very low.</source>
-        <translation type="obsolete">低電量</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">低電量警告.
-請換上備份電池</translation>
-    </message>
-    <message>
-        <source>business card</source>
-        <translation type="obsolete">business card </translation>
-    </message>
-    <message>
-        <source>Information</source>
-        <translation type="obsolete">訊息</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
-        <translation type="obsolete">&lt;p&gt;The system date doesn&apos;t seem to be valid.
-(%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
-    </message>
 </context>
 <context>
     <name>DesktopPowerAlerter</name>
     <message>
         <source>Battery Status</source>
         <translation type="unfinished">電池狀態</translation>
     </message>
     <message>
         <source>Low Battery</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -229,107 +162,44 @@ Please charge the back-up battery.</source>
     <message>
         <source>&lt;b&gt;Finding Documents...&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;The Documents Tab&lt;p&gt;has been disabled.&lt;p&gt;Use Settings-&gt;Launcher-&gt;DocTab&lt;p&gt;to reenable it.&lt;/b&gt;&lt;/center&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LauncherView</name>
     <message>
-        <source>%1 files</source>
-        <translation type="obsolete">%1 檔案</translation>
-    </message>
-    <message>
-        <source>All types of file</source>
-        <translation type="obsolete">所有類型檔案</translation>
-    </message>
-    <message>
         <source>Document View</source>
         <translation type="unfinished">文件瀏覽</translation>
     </message>
     <message>
         <source>All types</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Mediadlg</name>
     <message>
         <source>A new storage media detected:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>What should I do with it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MediumMountGui</name>
-    <message>
-        <source>Medium inserted</source>
-        <translation type="obsolete">中間插入</translation>
-    </message>
-    <message>
-        <source>A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</source>
-        <translation type="obsolete">A &lt;b&gt;storage medium&lt;/b&gt; was inserted. Should it be scanned for media files?</translation>
-    </message>
-    <message>
-        <source>Which media files</source>
-        <translation type="obsolete">Which media files</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation type="obsolete">音效</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="obsolete">圖形</translation>
-    </message>
-    <message>
-        <source>Text</source>
-        <translation type="obsolete">文字</translation>
-    </message>
-    <message>
-        <source>Video</source>
-        <translation type="obsolete">影像</translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="obsolete">所有</translation>
-    </message>
-    <message>
-        <source>Link apps</source>
-        <translation type="obsolete">連結程式</translation>
-    </message>
-    <message>
-        <source>Limit search to dir: (not used yet)</source>
-        <translation type="obsolete">Limit search to dir: (not used yet)</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">加入</translation>
-    </message>
-    <message>
-        <source>Your decision will be stored on the medium.</source>
-        <translation type="obsolete">你的決定將存在儲存媒体當中</translation>
-    </message>
-    <message>
-        <source>Do not ask again for this medium</source>
-        <translation type="obsolete">不再詢問這一個儲存媒体</translation>
-    </message>
-</context>
-<context>
     <name>MediumMountSetting::MediumMountWidget</name>
     <message>
         <source>Configure this medium. The changes will go into effect when the application gets closed. To update the Document Tab you need to remove and insert this medium.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Which media files</source>
         <translation type="unfinished">Which media files</translation>
     </message>
     <message>
         <source>Audio</source>
         <translation type="unfinished">音效</translation>
@@ -363,31 +233,24 @@ Please charge the back-up battery.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Scan whole media</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Always check this medium</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>Battery Status</source>
-        <translation type="obsolete">電池狀態</translation>
-    </message>
-</context>
-<context>
     <name>QueuedRequestRunner</name>
     <message>
         <source>Processing Queued Requests</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SafeMode</name>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
@@ -415,36 +278,24 @@ Please charge the back-up battery.</source>
     <name>ServerApplication</name>
     <message>
         <source>Information</source>
         <translation type="unfinished">訊息</translation>
     </message>
     <message>
         <source>&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</source>
         <translation type="unfinished">&lt;p&gt;The system date doesn&apos;t seem to be valid.
 (%1)&lt;/p&gt;&lt;p&gt;Do you want to correct the clock ?&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Battery level is critical!
-Keep power off until power restored!</source>
-        <translation type="obsolete">低電量警告! 
-請把電源關掉直到插上插座</translation>
-    </message>
-    <message>
-        <source>The Back-up battery is very low.
-Please charge the back-up battery.</source>
-        <translation type="obsolete">低電量警告.
-請換上備份電池</translation>
-    </message>
-    <message>
         <source>business card</source>
         <translation type="unfinished">business card </translation>
     </message>
     <message>
         <source>Safe Mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;P&gt;A system startup error occurred, and the system is now in Safe Mode. Plugins are not loaded in Safe Mode. You can use the Plugin Manager to disable plugins that cause system error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -505,81 +356,59 @@ immediately.</source>
         <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="obsolete">&lt;p&gt;
-These termination options are provided primarily for use while developing and testing the Opie system. In a normal environment, these concepts are unnecessary.</translation>
-    </message>
-    <message>
         <source>Cancel</source>
         <translation type="unfinished">取消</translation>
     </message>
     <message>
         <source>Shutdown...</source>
         <translation type="unfinished">關機..</translation>
     </message>
 </context>
 <context>
     <name>SyncAuthentication</name>
     <message>
         <source>Sync Connection</source>
         <translation type="unfinished">同步連結</translation>
     </message>
     <message>
-        <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</source>
-        <translation type="obsolete">&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade.</translation>
-    </message>
-    <message>
         <source>Deny</source>
         <translation type="unfinished">沒有權限</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</source>
         <translation type="unfinished">&lt;p&gt;An unrecognized system is requesting access to this device.&lt;p&gt;If you have just initiated a Sync for the first time, this is normal.</translation>
     </message>
     <message>
         <source>Allow</source>
         <translation type="unfinished">淮許</translation>
     </message>
     <message>
         <source>&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;If you are using a version of Qtopia Desktop older than 1.5.1, please upgrade or change the security setting to use IntelliSync.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;qt&gt;&lt;p&gt;An unauthorized system is requesting access to this device.&lt;p&gt;You chose IntelliSync so you may I allow or deny this connection.&lt;/qt&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SyncDialog</name>
     <message>
-        <source>Syncing</source>
-        <translation type="obsolete">同步中</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Contacts&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;連結&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&amp;Cancel</source>
-        <translation type="obsolete">&amp;取消</translation>
-    </message>
-    <message>
         <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Syncing:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/security.ts b/i18n/zh_TW/security.ts
index c3bdeac..6a1139b 100644
--- a/i18n/zh_TW/security.ts
+++ b/i18n/zh_TW/security.ts
@@ -65,48 +65,24 @@ You can only select an actually configured user.</source>
         <source>Sync</source>
         <translation type="unfinished">同步化</translation>
     </message>
     <message>
         <source>Attention</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-    <message>
         <source>Any</source>
         <translation type="unfinished">任何</translation>
     </message>
     <message>
         <source>None</source>
         <translation type="unfinished">無</translation>
     </message>
     <message>
         <source>Important notice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -181,152 +157,24 @@ You can only select an actually configured user.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Security</name>
-    <message>
-        <source>Set passcode</source>
-        <translation type="obsolete">設定通行碼</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">改變通行碼</translation>
-    </message>
-    <message>
-        <source>Enter passcode</source>
-        <translation type="obsolete">輸入通行碼</translation>
-    </message>
-    <message>
-        <source>Passcode incorrect</source>
-        <translation type="obsolete">通行碼不正確</translation>
-    </message>
-    <message>
-        <source>The passcode entered is incorrect.
-Access denied</source>
-        <translation type="obsolete">輸入的通行碼不正確.
-存取已拒絕</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">任何</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>Enter new passcode</source>
-        <translation type="obsolete">輸入新的通行碼</translation>
-    </message>
-    <message>
-        <source>Re-enter new passcode</source>
-        <translation type="obsolete">重新輸入新的通行碼</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24</source>
-        <translation type="obsolete">192.168.129.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
-    <name>SecurityBase</name>
-    <message>
-        <source>Security Settings</source>
-        <translation type="obsolete">安全性設定</translation>
-    </message>
-    <message>
-        <source>Change passcode</source>
-        <translation type="obsolete">改變通行碼</translation>
-    </message>
-    <message>
-        <source>Clear passcode</source>
-        <translation type="obsolete">清除通行碼</translation>
-    </message>
-    <message>
-        <source>Require pass code at power-on</source>
-        <translation type="obsolete">在電源開啟時要求輸入通行碼</translation>
-    </message>
-    <message>
-        <source>Sync</source>
-        <translation type="obsolete">同步化</translation>
-    </message>
-    <message>
-        <source>Accept sync from network:</source>
-        <translation type="obsolete">允許來自網路的同步化:</translation>
-    </message>
-    <message>
-        <source>192.168.0.0/16</source>
-        <translation type="obsolete">192.168.0.0/16</translation>
-    </message>
-    <message>
-        <source>172.16.0.0/12</source>
-        <translation type="obsolete">172.16.0.0/12</translation>
-    </message>
-    <message>
-        <source>10.0.0.0/8</source>
-        <translation type="obsolete">10.0.0.0/8</translation>
-    </message>
-    <message>
-        <source>Any</source>
-        <translation type="obsolete">任何</translation>
-    </message>
-    <message>
-        <source>None</source>
-        <translation type="obsolete">無</translation>
-    </message>
-    <message>
-        <source>&lt;P&gt;Pass code protection provides a minimal level of protection from casual access to this device.</source>
-        <translation type="obsolete">&lt;P&gt;通行碼防護提供基本層級的保護以避免對此裝置隨意的存取.</translation>
-    </message>
-    <message>
-        <source>192.168.129.0/24 (default)</source>
-        <translation type="obsolete">192.168.129.0/24 (預設值)</translation>
-    </message>
-    <message>
-        <source>192.168.1.0/24</source>
-        <translation type="obsolete">192.168.1.0/24</translation>
-    </message>
-    <message>
-        <source>1.0.0.0/8</source>
-        <translation type="obsolete">1.0.0.0/8</translation>
-    </message>
-</context>
-<context>
     <name>SyncBase</name>
     <message>
         <source>SyncBase</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>
diff --git a/i18n/zh_TW/snake.ts b/i18n/zh_TW/snake.ts
index 71f7d83..d2ed62f 100644
--- a/i18n/zh_TW/snake.ts
+++ b/i18n/zh_TW/snake.ts
@@ -12,39 +12,31 @@
     <message>
         <source>SNAKE!</source>
         <translation>貪食蛇!</translation>
     </message>
     <message>
         <source>Use the arrow keys to guide the
 snake to eat the mouse. You must not
 crash into the walls, edges or its tail.</source>
         <translation>使用方向鍵以控制蛇去吃老鼠
 不能碰到牆.蛋或是他的尾巴</translation>
     </message>
     <message>
-        <source>Press Any Key To Start</source>
-        <translation type="obsolete">按任意鍵以開始</translation>
-    </message>
-    <message>
         <source>     Score :    %1   </source>
         <translation>     分數 :    %1   </translation>
     </message>
     <message>
         <source>GAME OVER!
  Your Score: %1</source>
         <translation>GAME OVER!
  你的得分: %1</translation>
     </message>
     <message>
-        <source>Press Any Key to Begin a New Game.</source>
-        <translation type="obsolete">按任意鍵以開始新遊戲</translation>
-    </message>
-    <message>
         <source>Press any key to start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Press any key to begin a new game.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>
diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index fa5b4d4..983bd63 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -142,40 +142,24 @@
         <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 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>
@@ -187,57 +171,48 @@ Memory is categorized as follows:
         <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>
-    <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>
     <message>
@@ -287,29 +262,24 @@ Click and hold on a process to see additional information about the process, or
         <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>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>
@@ -359,32 +329,24 @@ to this process?</source>
         <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 type="obsolete">&lt;p&gt;型號: </translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;Vendor: </source>
-        <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>
     <message>
diff --git a/i18n/zh_TW/tableviewer.ts b/i18n/zh_TW/tableviewer.ts
index 169890e..4f83fb5 100644
--- a/i18n/zh_TW/tableviewer.ts
+++ b/i18n/zh_TW/tableviewer.ts
@@ -1,25 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>QObject</name>
-    <message>
-        <source>KeyList::addKey() Cannot make default value for type %1, Key not added.</source>
-        <translation type="obsolete">KeyList::addKey() 無法設定預設值 %1, Key not added.</translation>
-    </message>
-    <message>
-        <source>DataElem::setField(%1, %2) No valid type found</source>
-        <translation type="obsolete">DataElem::setField(%1, %2) No valid type found</translation>
-    </message>
-</context>
-<context>
     <name>TVBrowseKeyEntry</name>
     <message>
         <source>Reset</source>
         <translation>重設</translation>
     </message>
     <message>
         <source>key</source>
         <translation>key</translation>
     </message>
 </context>
 <context>
     <name>TVKeyEdit_gen</name>
diff --git a/i18n/zh_TW/textedit.ts b/i18n/zh_TW/textedit.ts
index f941791..cfea525 100644
--- a/i18n/zh_TW/textedit.ts
+++ b/i18n/zh_TW/textedit.ts
@@ -145,30 +145,24 @@
         <source>Unnamed</source>
         <translation type="unfinished">未名命</translation>
     </message>
     <message>
         <source>Permissions</source>
         <translation type="unfinished">權限</translation>
     </message>
     <message>
         <source>Choose font</source>
         <translation type="unfinished">選擇字型</translation>
     </message>
     <message>
-        <source>Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</source>
-        <translation type="obsolete">Do you really want&lt;BR&gt;to &lt;B&gt;delete&lt;/B&gt; the current file
-from the disk?&lt;BR&gt;This is &lt;B&gt;irreversable!!&lt;/B&gt;</translation>
-    </message>
-    <message>
         <source>Yes</source>
         <translation type="unfinished">是的</translation>
     </message>
     <message>
         <source>No</source>
         <translation type="unfinished">否</translation>
     </message>
     <message>
         <source>Text Edit is copyright&lt;BR&gt;2000 Trolltech AS, and&lt;BR&gt;2002 by &lt;B&gt;L. J. Potter &lt;BR&gt;llornkcor@handhelds.org&lt;/B&gt;&lt;BR&gt;and is licensed under the GPL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index daa3839..59b9741 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -5,28 +5,24 @@
         <source>Today</source>
         <translation type="unfinished">今日</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 type="obsolete">找不到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>
     <message>
         <source>Today Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -59,72 +55,28 @@
         <source>Move Up</source>
         <translation>上移</translation>
     </message>
     <message>
         <source>Move Down</source>
         <translation>下移</translation>
     </message>
     <message>
         <source>active/order</source>
         <translation>啟動/順序</translation>
     </message>
     <message>
-        <source>autostart on 
-resume?
- (Opie only)</source>
-        <translation type="obsolete">Resume後
-        自動啟動？
-        (OPie only)</translation>
-    </message>
-    <message>
-        <source>minutes inactive</source>
-        <translation type="obsolete">休眠分鐘數</translation>
-    </message>
-    <message>
         <source>Misc</source>
         <translation>其他</translation>
     </message>
     <message>
-        <source>Check this if today should be autostarted on resume.</source>
-        <translation type="obsolete">打勾開啟喚醒時自動啟動「今日」功能</translation>
-    </message>
-    <message>
-        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation type="obsolete">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
-    </message>
-    <message>
-        <source>Icon size</source>
-        <translation type="obsolete">圖示大小</translation>
-    </message>
-    <message>
-        <source>Set the icon size in pixel</source>
-        <translation type="obsolete">設定圖示的像素點數</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="obsolete">更新內容</translation>
-    </message>
-    <message>
-        <source>How often should Today refresh itself</source>
-        <translation type="obsolete">「今日」多久自動更新一次內容</translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="obsolete">秒</translation>
-    </message>
-    <message>
-        <source>never</source>
-        <translation type="obsolete">永不</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>勾選要啟動的plugins，並用右側的上下箭頭來調整顯示順序</translation>
     </message>
     <message>
         <source>Today Config</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TodayConfigMiscBase</name>
     <message>
         <source>Form1</source>
diff --git a/i18n/zh_TW/todolist.ts b/i18n/zh_TW/todolist.ts
index 2d3a617..7d01365 100644
--- a/i18n/zh_TW/todolist.ts
+++ b/i18n/zh_TW/todolist.ts
@@ -80,135 +80,75 @@
     <message>
         <source>silent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>loud</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QWidget</name>
     <message>
-        <source>New from template</source>
-        <translation type="obsolete">利用樣板建立新事項</translation>
-    </message>
-    <message>
-        <source>New Task</source>
-        <translation type="obsolete">新增待辦事項</translation>
-    </message>
-    <message>
-        <source>Edit Task</source>
-        <translation type="obsolete">編輯待辦事項</translation>
-    </message>
-    <message>
-        <source>View Task</source>
-        <translation type="obsolete">檢視待辦事項</translation>
-    </message>
-    <message>
-        <source>Delete...</source>
-        <translation type="obsolete">刪除...</translation>
-    </message>
-    <message>
-        <source>Delete all...</source>
-        <translation type="obsolete">刪除全部....</translation>
-    </message>
-    <message>
         <source>Delete completed</source>
         <translation type="unfinished">刪除已完成事項</translation>
     </message>
     <message>
-        <source>Duplicate</source>
-        <translation type="obsolete">複製事項</translation>
-    </message>
-    <message>
-        <source>Beam</source>
-        <translation type="obsolete">傳送資料</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">搜尋</translation>
-    </message>
-    <message>
         <source>Show completed tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only over-due tasks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show task deadlines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show quick task bar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Data</source>
-        <translation type="obsolete">資料管理</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">分類目錄</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="obsolete">設定選項</translation>
-    </message>
-    <message>
         <source>QuickEdit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all current tasks.
 
 The list displays the following information:
 1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.
 2. Priority - a graphical representation of task priority.  Double-click here to modify.
 3. Description - description of task.  Click here to select the task.
 4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options-&gt;&apos;Show task deadlines&apos; from the menu above.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Categories</source>
-        <translation type="obsolete">全部目錄</translation>
-    </message>
-    <message>
-        <source>Unfiled</source>
-        <translation type="obsolete">未分類的</translation>
-    </message>
-    <message>
         <source>Out of space</source>
         <translation type="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>
@@ -219,28 +159,24 @@ Quit Anyway?</source>
         <source>C.</source>
         <translation type="unfinished">完成</translation>
     </message>
     <message>
         <source>Priority</source>
         <translation type="unfinished">優先順序</translation>
     </message>
     <message>
         <source>Deadline</source>
         <translation type="unfinished">到期日</translation>
     </message>
     <message>
-        <source>Configure Templates</source>
-        <translation type="obsolete">樣板管理</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>
diff --git a/i18n/zh_TW/usermanager.ts b/i18n/zh_TW/usermanager.ts
index 111e5ae..8f54a49 100644
--- a/i18n/zh_TW/usermanager.ts
+++ b/i18n/zh_TW/usermanager.ts
@@ -4,28 +4,24 @@
     <message>
         <source>Add Group</source>
         <translation>新增群組</translation>
     </message>
     <message>
         <source>Edit Group</source>
         <translation>編輯群組</translation>
     </message>
 </context>
 <context>
     <name>UserConfig</name>
     <message>
-        <source>OPIE User Manager</source>
-        <translation type="obsolete">OPIE 使用者管理員</translation>
-    </message>
-    <message>
         <source>Opie User Manager</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserDialog</name>
     <message>
         <source>Add User</source>
         <translation>新增使用者</translation>
     </message>
     <message>
         <source>Edit User</source>
diff --git a/i18n/zh_TW/zsafe.ts b/i18n/zh_TW/zsafe.ts
index 06fbae6..876279b 100644
--- a/i18n/zh_TW/zsafe.ts
+++ b/i18n/zh_TW/zsafe.ts
@@ -1,225 +1,14 @@
 <!DOCTYPE TS><TS>
 <context>
-    <name>@default</name>
-    <message>
-        <source>ZSafe</source>
-        <translation type="obsolete">ZSafe</translation>
-    </message>
-    <message>
-        <source>Do you want to delete?</source>
-        <translation type="obsolete">Wollen Sie wirklich löschen?</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="obsolete">&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>D&amp;on&apos;t Delete</source>
-        <translation type="obsolete">&amp;Nicht löschen</translation>
-    </message>
-    <message>
-        <source>Edit Entry</source>
-        <translation type="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Username</source>
-        <translation type="obsolete">Benutzername</translation>
-    </message>
-    <message>
-        <source>Password</source>
-        <translation type="obsolete">Passwort</translation>
-    </message>
-    <message>
-        <source>Comment</source>
-        <translation type="obsolete">Kommentar</translation>
-    </message>
-    <message>
-        <source>Field 4</source>
-        <translation type="obsolete">Feld 4</translation>
-    </message>
-    <message>
-        <source>Field 5</source>
-        <translation type="obsolete">Feld 5</translation>
-    </message>
-    <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
-        <source>Entry name must be different
-from the category name.</source>
-        <translation type="obsolete">Die Namen der Einträge
-müssen sich von der
-Kategorie unterscheiden.</translation>
-    </message>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>Entry not found</source>
-        <translation type="obsolete">Eintrag nicht gefunden</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Ok</translation>
-    </message>
-    <message>
-        <source>Field 2</source>
-        <translation type="obsolete">Feld 2</translation>
-    </message>
-    <message>
-        <source>Field 3</source>
-        <translation type="obsolete">Feld 3</translation>
-    </message>
-    <message>
-        <source>Could not remove text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht löschen.</translation>
-    </message>
-    <message>
-        <source>Could not export to text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht exportieren.</translation>
-    </message>
-    <message>
-        <source>Could not import text file.</source>
-        <translation type="obsolete">Konnte Textdatei nicht importieren.</translation>
-    </message>
-    <message>
-        <source>Enter Password</source>
-        <translation type="obsolete">Passwort eingeben</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Falsches Passwort
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
-        <source>Wrong password.
-Enter again?</source>
-        <translation type="obsolete">Falsches Passwort.
-Neu eingeben?</translation>
-    </message>
-    <message>
-        <source>&amp;Yes</source>
-        <translation type="obsolete">&amp;Ja</translation>
-    </message>
-    <message>
-        <source>&amp;No.</source>
-        <translation type="obsolete">&amp;Nein.</translation>
-    </message>
-    <message>
-        <source>Empty document or
-wrong password.
-Continue?</source>
-        <translation type="obsolete">Leeres Dokument oder
-falsches Passwort.
-Fortfahren?</translation>
-    </message>
-    <message>
-        <source>&amp;No</source>
-        <translation type="obsolete">&amp;Nein</translation>
-    </message>
-    <message>
-        <source>&amp;Yes.</source>
-        <translation type="obsolete">&amp;Ja.</translation>
-    </message>
-    <message>
-        <source>Password is empty.
-Please enter again.</source>
-        <translation type="obsolete">Das Passwort ist leer.
-Bitte nochmals eingeben.</translation>
-    </message>
-    <message>
-        <source>Reenter Password</source>
-        <translation type="obsolete">Passwort nochmals eingeben</translation>
-    </message>
-    <message>
-        <source>Passwords must be identical.
-Please enter again.</source>
-        <translation type="obsolete">Die Passwörter müssen
-gleich sein. Bitte nochmals
-Passwort eingeben.</translation>
-    </message>
-    <message>
-        <source>&amp;Save</source>
-        <translation type="obsolete">&amp;Sichern</translation>
-    </message>
-    <message>
-        <source>&amp;Don&apos;t Save</source>
-        <translation type="obsolete">&amp;Nicht sichern</translation>
-    </message>
-    <message>
-        <source>Password file saved.</source>
-        <translation type="obsolete">Passwort-Datei gesichert.</translation>
-    </message>
-    <message>
-        <source>Do you want to save
-before exiting?</source>
-        <translation type="obsolete">Wollen Sie vor dem Beenden
-die Daten speichern?</translation>
-    </message>
-    <message>
-        <source>S&amp;ave with
-new
-password</source>
-        <translation type="obsolete">Mit neuem
-&amp;Passwort
-sichern</translation>
-    </message>
-    <message>
-        <source>Category</source>
-        <translation type="obsolete">Kategorie</translation>
-    </message>
-    <message>
-        <source>Wait dialog</source>
-        <translation type="obsolete">Bitte warten</translation>
-    </message>
-    <message>
-        <source>Gathering icons...</source>
-        <translation type="obsolete">Suche nach Symbolen...</translation>
-    </message>
-    <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Open ZSafe document</source>
-        <translation type="obsolete">Öffne ZSafe Datei</translation>
-    </message>
-    <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</translation>
-    </message>
-    <message>
-        <source>Zaurus Password Manager&lt;br&gt;</source>
-        <translation type="obsolete">Zaurus Passwort Manager&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>by Carsten Schneider&lt;br&gt;</source>
-        <translation type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </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>
@@ -409,35 +198,24 @@ shows the list of dirs and files</source>
     <message>
         <source>Please Wait...</source>
         <translation>Bitte warten...</translation>
     </message>
 </context>
 <context>
     <name>ZSafe</name>
     <message>
         <source>ZSafe</source>
         <translation>ZSafe</translation>
     </message>
     <message>
-        <source>Can&apos;t create directory
-%1
-
-ZSafe will now exit.</source>
-        <translation type="obsolete">Kann das Verzeichnis
-%1
-nicht anlegen
-
-ZSafe wird sich jetzt beenden.</translation>
-    </message>
-    <message>
         <source>&amp;Save document</source>
         <translation>&amp;Speichern</translation>
     </message>
     <message>
         <source>S&amp;ave document with new Password</source>
         <translation>Speichern mit neuem &amp;Passwort</translation>
     </message>
     <message>
         <source>&amp;Export text file</source>
         <translation>Textdatei &amp;Exportieren</translation>
     </message>
     <message>
@@ -500,36 +278,24 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>&amp;About</source>
         <translation>&amp;Über</translation>
     </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished">Ändern</translation>
     </message>
     <message>
-        <source>Delete</source>
-        <translation type="obsolete">Löschen</translation>
-    </message>
-    <message>
-        <source>Find</source>
-        <translation type="obsolete">Suchen</translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="obsolete">Neu</translation>
-    </message>
-    <message>
         <source>Name</source>
         <translation>Name</translation>
     </message>
     <message>
         <source>Field 2</source>
         <translation>Feld 2</translation>
     </message>
     <message>
         <source>Field 3</source>
         <translation>Feld 3</translation>
     </message>
     <message>
@@ -544,40 +310,32 @@ ZSafe wird sich jetzt beenden.</translation>
         <source>Field 5</source>
         <translation>Feld 5</translation>
     </message>
     <message>
         <source>Do you want to delete?</source>
         <translation type="unfinished">Wollen Sie wirklich 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="obsolete">Eintrag ändern</translation>
-    </message>
-    <message>
         <source>Username</source>
         <translation type="unfinished">Benutzername</translation>
     </message>
     <message>
         <source>Password</source>
         <translation type="unfinished">Passwort</translation>
     </message>
     <message>
-        <source>New Entry</source>
-        <translation type="obsolete">Neuer Eintrag</translation>
-    </message>
-    <message>
         <source>Entry name must be different
 from the category name.</source>
         <translation type="unfinished">Die Namen der Einträge
 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>
@@ -688,64 +446,40 @@ sichern</translation>
         <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>Zaurus Password Manager&lt;br&gt;</source>
-        <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 type="obsolete">von Carsten Schneider&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Translations by Robert Ernst&lt;br&gt;</source>
-        <translation type="obsolete">Übersetzungen von Robert Ernst&lt;br&gt;</translation>
-    </message>
-    <message>
         <source>&amp;New document</source>
         <translation>&amp;Neue Datei</translation>
     </message>
     <message>
         <source>&amp;Open document</source>
         <translation>&amp;Öffne Datei</translation>
     </message>
     <message>
         <source>&amp;Save document as ..</source>
         <translation>&amp;Speichere Datei als..</translation>
     </message>
     <message>
-        <source>Create new ZSafe document</source>
-        <translation type="obsolete">Erzeuge neue ZSafe Datei</translation>
-    </message>
-    <message>
         <source>Open ZSafe document</source>
         <translation type="unfinished">Öffne ZSafe Datei</translation>
     </message>
     <message>
-        <source>Save ZSafe document as..</source>
-        <translation type="obsolete">Speichere ZSafe Datei als..</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>